diff options
| author | Tao Bao <tbao@google.com> | 2019-05-21 20:51:10 -0700 |
|---|---|---|
| committer | Tao Bao <tbao@google.com> | 2019-05-23 14:41:35 -0700 |
| commit | deda98e46963e49b4107b99fdd17ee0e1d827446 (patch) | |
| tree | 329d2df81cd83ea308c7431fba2f6ec4af2ba17b /device-common.mk | |
| parent | febed0123b0b0ca09795d3c3ab4226c75d8496b7 (diff) | |
| download | marlin-deda98e46963e49b4107b99fdd17ee0e1d827446.tar.gz | |
Deprecate PRODUCT_STATIC_BOOT_CONTROL_HAL.
In favor of using boot control HAL under recovery.
Bug: 34254109
Test: TreeHugger
Test: Build and flash sailfish. Do sanity check.
Test: Sideloading a package on sailfish.
Change-Id: I01e5f605749f5d2ffa58d10b1250659ff4db1d59
Diffstat (limited to 'device-common.mk')
| -rw-r--r-- | device-common.mk | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/device-common.mk b/device-common.mk index e47369f2..7b7d3b19 100644 --- a/device-common.mk +++ b/device-common.mk @@ -435,13 +435,6 @@ PRODUCT_PACKAGES += \ update_engine \ update_verifier -# Enable update engine sideloading by including the static version of the -# boot_control HAL and its dependencies. -PRODUCT_STATIC_BOOT_CONTROL_HAL := \ - bootctrl.msm8996 \ - libgptutils \ - libz \ - libcutils PRODUCT_PACKAGES += \ update_engine_sideload @@ -520,6 +513,7 @@ PRODUCT_PACKAGES += \ # Boot control PRODUCT_PACKAGES += \ android.hardware.boot@1.0-impl:64 \ + android.hardware.boot@1.0-impl.recovery:64 \ android.hardware.boot@1.0-service # Library used for VTS tests (only for userdebug and eng builds) @@ -540,7 +534,9 @@ PRODUCT_COPY_FILES += \ # Bootloader HAL used for A/B updates. PRODUCT_PACKAGES += \ - bootctrl.msm8996 + bootctrl.msm8996 \ + bootctrl.msm8996.recovery + PRODUCT_PACKAGES_DEBUG += \ bootctl |