Commit Graph

42 Commits

Author SHA1 Message Date
Steven Moreland
cbc6f50bb9 device FCM -= android.* am: f2a2675372 am: 2443a6a6b3
Original change: https://android-review.googlesource.com/c/device/google/redfin/+/2654090

Change-Id: I0d37656d310263fe074af0ba6369247bca0f298d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-28 19:50:21 +00:00
Steven Moreland
f2a2675372 device FCM -= android.*
Bug: 290408770
Test: N/A
Change-Id: I4b47171f62daebb85bb405e7a9713ef32c888913
2023-07-12 23:07:55 +00:00
Gabriel Biren
e97e349073 Revert "Update Redfin compatibility matrix to use the"
This reverts commit 5f06ae8d25.

Reason for revert: Blocking Wembley team

Change-Id: I25338eded93b9009090a5b9b22c09af52c934f57
2022-12-01 22:27:42 +00:00
Gabriel Biren
5f06ae8d25 Update Redfin compatibility matrix to use the
AIDL wifi_ext service.

Bug: 205044134
Test: Presubmit tests
Change-Id: I263e094cda4ccd78f07d3082e26caf8a7ef93d63
2022-10-28 18:52:47 +00:00
Stephane Lee
991bcce28e Add device-specific support for GoogleBattery AIDL V1 am: d543694a05
Original change: https://googleplex-android-review.googlesource.com/c/device/google/redfin/+/19330369

Change-Id: Ifa9089d0bb8bb51bb3503d3a455f9d00a74be175
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-28 23:51:55 +00:00
Stephane Lee
d543694a05 Add device-specific support for GoogleBattery AIDL V1
Bug: 232461104
Test: Ensure Adaptive Charging/Battery health flags works as expected
Change-Id: Ia4ce4f7142804c56a43c0dc9869f4af39b984328
Merged-In: Ia4ce4f7142804c56a43c0dc9869f4af39b984328
2022-07-22 00:33:31 +00:00
Stephane Lee
de3649f99b Merge "Add device-specific support for GoogleBattery AIDL V1" 2022-06-08 18:10:52 +00:00
Daniel Norman
dfa84c19c0 Remove danielnorman@ & others from OWNERs. am: f3cca16cac am: 6f71d7c0fc am: 7b936bfc10 am: 96ea806fd0 am: 7803d0ad8c
Original change: https://android-review.googlesource.com/c/device/google/redfin/+/2118808

Change-Id: I2ddf5f165c9e2c2221335abf67a51460c4b7ee07
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-07 23:25:45 +00:00
Daniel Norman
7b936bfc10 Remove danielnorman@ & others from OWNERs. am: f3cca16cac am: 6f71d7c0fc
Original change: https://android-review.googlesource.com/c/device/google/redfin/+/2118808

Change-Id: Ic8db37e46e0a5308548f635751ecddd793ed2ad4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-07 21:55:55 +00:00
Daniel Norman
f3cca16cac Remove danielnorman@ & others from OWNERs.
Bug: 235251309
Change-Id: I45665e69ca80ba6ec1d50109243101173517c15b
2022-06-07 19:28:17 +00:00
Daniel Norman
167f2fe910 Creates the FCM for redfin_vf_t (U system + T vendor).
Bug: 233646904
Test: lunch redfin_vf_t; m
Change-Id: I857e6404d35a8922ead1ff619d797a615b9113b9
2022-06-07 16:31:16 +00:00
Stephane Lee
afaa44272e Add device-specific support for GoogleBattery AIDL V1
Bug: 232461104
Test: Ensure Adaptive Charging/Battery health flags works as expected
Change-Id: Ia4ce4f7142804c56a43c0dc9869f4af39b984328
2022-05-26 15:09:38 -07:00
Daniel Norman
2beae2d783 [conflict] Remove now-unnecessary merge configs. am: 01b1c623c4 am: 67e0c9cddc am: b8ec84ded1
Original change: https://android-review.googlesource.com/c/device/google/redfin/+/2032084

Change-Id: I0db29796bc349cbf6abc910f718ebc726824f65a
2022-03-18 23:00:49 +00:00
Daniel Norman
01b1c623c4 Remove now-unnecessary merge configs.
The values in these files can now be inferred,
starting in https://r.android.com/2006311.

In fact, since http://cl/435084270 they have been inferred for these
redfin VF targets.

Bug: 221858722
Test: n/a, files unused
Merged-In: I6851bed2ece4c932133228afd47117a47483d7ad
Change-Id: Iec4ab4b9d73f75df4bf87a5288d3bcb525a0e0d5
2022-03-18 18:48:23 +00:00
Daniel Norman
d0acdf5477 Remove now-unnecessary merge configs.
The values in these files can now be inferred,
starting in https://r.android.com/2006311.

In fact, since http://cl/435084270 they have been inferred for these
redfin VF targets.

Bug: 221858722
Test: n/a, files unused
Change-Id: I6851bed2ece4c932133228afd47117a47483d7ad
2022-03-18 11:43:28 -07:00
Stephane Lee
909f0befb9 Add device-specific support for GoogleBattery HAL 1.2.
Bug: 205021987
Test: Ensure Adaptive Charging/Battery health flags works as expected.
Change-Id: Ic542dce49e3814101b6c89ed482a941c7ba93ef9
2022-01-24 17:32:36 +00:00
Daniel Norman
4f1bf43c7b Revert "Remove now-unused *_disable_sparse misc info keys."
This reverts commit 81ee6d7df4.

These were re-enabled in https://r.android.com/1835304.

Fixes: 203416934
Test: build redfin_vf_[r|s]-userdebug
Change-Id: I7b6096ccd293ca7e3d9d34de0ac3032acab83f70
2021-10-18 09:03:53 -07:00
Daniel Norman
81ee6d7df4 Remove now-unused *_disable_sparse misc info keys.
The system builds now appear to no longer set *_disable_sparse for
system, system_ext, or product.
Only system_other sets this field true.

Bug: 201102472
Test: build on go/abtd
Change-Id: If78a6872453a6d70bac6c0230a28d9e5755c05fa
2021-10-01 17:02:40 +00:00
Daniel Norman
74f3f1ccd4 Add new <partition>_disable_sparse flags to system keys merge config.
These were added in https://r.android.com/1811336 and should be used by
the merged build so that non-sparse images are not treated as sparse
images.

Bug: 201102472
Test: build
Change-Id: I6c2cbcfec702fd27fa62cb0cedebc72e958bdf4b
2021-09-30 13:54:50 -07:00
Daniel Norman
c326f575ee Update supported HALs for redfin S vendor image.
Bug: 191304621
Test: Merge redfin_vf_s T-based system with S-based vendor.
Change-Id: Ia90bb165d6e8126d8fac895469ea37d97e5c0dd4
2021-07-16 17:33:56 -07:00
Daniel Norman
6cf075af5f Adapt to rename of the redfin R-vendor-based FCM. am: 3b3f24621f
Original change: https://googleplex-android-review.googlesource.com/c/device/google/redfin/+/14236185

Change-Id: I9836bb60103c9c02f8c4cd85aab1d708e6f2aa8d
2021-04-19 21:32:58 +00:00
Daniel Norman
3b3f24621f Adapt to rename of the redfin R-vendor-based FCM.
Bug: 184545288
Change-Id: Ic722dbbaf4ee7cd63d9d8291badce38150a76095
2021-04-19 16:04:47 +00:00
Daniel Norman
39c19b9074 Defines two separate product FCMs for redfin VF: R vendor and S vendor. am: ded4517e3a
Original change: https://googleplex-android-review.googlesource.com/c/device/google/redfin/+/14176765

Change-Id: Ifa87d560e932b0807765234cb9e42e1b0958990e
2021-04-16 19:03:35 +00:00
Daniel Norman
ded4517e3a Defines two separate product FCMs for redfin VF: R vendor and S vendor.
Both are device manifest level=5, but the R vendor and S vendor provide
a slightly different set of HALs.

Bug: 184545288
Test: Include the R FCM on a system-only build merged with an R-based
      vendor, merge & boot
Test: Likewise, for S FCM and S-based vendor.
Change-Id: I5658dc4a9d989e38c7fa05337c37457598368aa2
2021-04-13 13:12:40 -07:00
Bob Badour
233004f36b [LSC] Add LOCAL_LICENSE_KINDS to device/google/redfin am: 52df75ccbd
Original change: https://googleplex-android-review.googlesource.com/c/device/google/redfin/+/14113195

Change-Id: Ic9357c117758316dd3e54c4670a088b063096ec7
2021-04-07 16:18:00 +00:00
Bob Badour
52df75ccbd [LSC] Add LOCAL_LICENSE_KINDS to device/google/redfin
Added SPDX-license-identifier-Apache-2.0 to:
  vf/Android.bp
  vibrator/drv2624/bench/Android.bp
  vibrator/drv2624/tests/Android.bp

Bug: 68860345
Bug: 151177513
Bug: 151953481

Test: m all

Exempt-From-Owner-Approval: janitorial work
Change-Id: I3866a4e25b4e6196d8960b33e3b73ed42abbded3
2021-04-07 07:31:48 -07:00
Daniel Norman
fcf85bcf8a Creates a complete product FCM with level=5 for redfin VF with R vendor. am: 7c093c13dc
Original change: https://googleplex-android-review.googlesource.com/c/device/google/redfin/+/14052758

Change-Id: I3206d364aad91293bfeb764f48990dbd00399325
2021-04-06 23:48:04 +00:00
Daniel Norman
7c093c13dc Creates a complete product FCM with level=5 for redfin VF with R vendor.
Every HAL in this FCM is marked as required.

Bug: 183507590
Test: m redfin_vf, merge with R vendor half
Change-Id: I7959b136ffa936de1e089f9e285d863ddfc47a94
2021-04-06 09:44:56 -07:00
Daniel Norman
dae42e5b4f Adds IWirelessCharger 1.2 to the Vendor Freeze redfin framework matrix. am: 16a36993e3
Original change: https://googleplex-android-review.googlesource.com/c/device/google/redfin/+/13971966

Change-Id: I1e885badd73b5c6a2a368ff62b7ca241a96ebc7c
2021-03-23 23:54:34 +00:00
Daniel Norman
16a36993e3 Adds IWirelessCharger 1.2 to the Vendor Freeze redfin framework matrix.
This change also marks 1.3 as optional.
Older redfin vendor images only provide 1.2.

Bug: 183502398
Test: build & boot redfin VF with R vendor and S system
Change-Id: I236e961ad9c40ddc5bb30259d56429a56950d345
2021-03-23 09:22:22 -07:00
Daniel Norman
cb45f889c9 Adds vbmeta_system to the redfin VF framework merge config.
This should have been present from the start, because it is an image
that fully relies only on the system build.

Test: build and merge R+S redfin_vf-userdebug, boot
Change-Id: I9d3871e2d2fa6f64b92142470ca7199caaf2b272
2021-01-28 16:05:09 -08:00
Daniel Norman
c63b4a5da2 Changes these VF-compatibility HALs from optional to required.
These HALs are always provided by the Android 11 vendor implementation.

Test: Build and merge redfin with S system and R vendor.
Bug: 176123039
Change-Id: Ic537c9df178cd219a35ccd959aaa775fb3ab5d7d
2021-01-07 10:09:22 -08:00
Daniel Norman
753defed9b Adds vendor.qti.hardware.bluetooth_sar to redfin_vf FCM.
This is needed because non-VF switched from this HAL to
hardware.google.bluetooth.sar. The old HAL is required in the FCM to
pass check_vintf when merging.

Bug: 176365905
Test: Build and merge, flash and basic BT functionality check.
Change-Id: Ia28bf5d8cd8155dfa5d183317168fac190755771
2020-12-27 05:55:43 +00:00
Daniel Norman
c38f8cf028 Removes now-obsolete aosp_redfin_vf merge.sh.
This script has been moved to tools/treble/vf.

Test: n/a
Change-Id: I7ef8148b515e6100e5b567db888b33a285c0a359
2020-12-08 18:19:24 +00:00
Daniel Norman
926ae6e30b Moves/renames files to prepare aosp_redfin_vf for flashing.
- Moves the system-only build's *.zip files to a new system_build
  subdirectory in dist.
- Renames the merged outputs to match the expected pattern, including
  build ID.
- Includes the vendor build's android-info.txt in dist, used when
  flashing.

Test: merge.sh, observe output dist dir.
Bug: 174061071
Change-Id: Ie108742407ede6ba4e398bcd184fb05b49f1f670
2020-11-23 12:31:58 -08:00
Daniel Norman
37de3202fc Makes aosp_redfin_vf merge script fail on errors.
Test: merge.sh with a failing merge, observe non-zero result.
Change-Id: I47a5de9787531d9f4c812ceb77929489a7661fdf
2020-11-20 23:47:10 +00:00
Daniel Norman
9f904c3447 Adds source+lunch before calling merge_target_files.
This is needed so that merge_target_files can run soong_zip.
(soong_zip cannot be added as a 'required' dependency of
merge_target_files, only as a tool in genrules.)

Test: merge.sh in a shell window without manually lunching first,
      observe success.
Change-Id: I9305f32a6cceaed454cd3237514eec537b2be915
2020-11-20 11:18:15 -08:00
Daniel Norman
f31b38c8aa Copies bootloader and radio from vendor dir to dist when merging.
These are used when flashing the device.

Bug: 169892879
Test: merge.sh, observe copied files
Change-Id: I2497feb775373d1318181927d9c7f26edd67ada2
2020-11-17 12:08:14 -08:00
Daniel Norman
a53995d8ad Adds a framework compatibility matrix for aosp_redfin_vf.
This is needed because check_vintf fails for any "unused" HALs in
the device manifest that aren't found in the framework compatibility
matrix.

Bug: 169892879
Test: Merge and boot aosp_redfin_vf with a vendor half from rvc.
Change-Id: I4cb65c12ade630df8916683029ccf0fa17d8892e
2020-11-17 10:58:10 -08:00
Daniel Norman
5df2f619bc Disables building ramdisk for aosp_redfin_vf system build.
RAMDISK is provided inside BOOT/* and VENDOR_BOOT/* on aosp_redfin.

Test: m dist, inspect output images. No ramdisk.img.
      Merge with aosp_redfin from R, boot device.
Change-Id: I3ec85067a1255e83d9722dda23840f62e496173d
2020-10-19 14:18:55 -07:00
Daniel Norman
afbd01e872 Adds merge config files for aosp_redfin_vf.
Includes a small merge.sh that calls merge_target_files with the
necessary flags. This allows updating arguments in a presubmit-guarded
manner, rather than in the branch definition file.

Bug: 170683837
Test: device/google/redfin/vf/merge.sh out/dist
      to merge aosp_redfin_vf from S with aosp_redfin from R.
      Boot device.
Change-Id: I8cefeabd7bce678c170b119983fd0b3d54e45390
2020-10-16 15:00:40 -07:00
Daniel Norman
ad6c41e9cd Creates a new 'vf' Vendor Freeze subdir, with OWNERS.
Test: lunch aosp_redfin_vf-userdebug, m
Change-Id: Ibce0f096c1ce08b3131b6d9a623955725479be98
2020-10-14 11:40:40 -07:00