Commit Graph

16 Commits

Author SHA1 Message Date
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 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 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 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 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 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