From deda98e46963e49b4107b99fdd17ee0e1d827446 Mon Sep 17 00:00:00 2001 From: Tao Bao Date: Tue, 21 May 2019 20:51:10 -0700 Subject: 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 --- device-common.mk | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) (limited to 'device-common.mk') 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 -- cgit v1.2.3