From b9d535356b25dd638428c2b4d71e7031752c67db Mon Sep 17 00:00:00 2001 From: Hridya Valsaraju Date: Thu, 16 Aug 2018 10:45:05 -0700 Subject: [PATCH] Correct PRODUCT_USE_FASTBOOTD USAGE Remove all usage of flag PRODUCT_USE_FASTBOOTD as it will not be set when these files are processed by the build system. Bug: 78793464 Test: make bootimage and check for fastbootd binary in recovery Change-Id: I371a6d2beddeb54a88281934b54b8c61ead12d4f --- target/product/base_system.mk | 5 ----- target/product/base_vendor.mk | 6 ------ target/product/mainline_system.mk | 27 --------------------------- 3 files changed, 38 deletions(-) diff --git a/target/product/base_system.mk b/target/product/base_system.mk index 27b8efc3e..e71e0e94e 100644 --- a/target/product/base_system.mk +++ b/target/product/base_system.mk @@ -259,11 +259,6 @@ PRODUCT_PACKAGES += \ framework_manifest.xml \ framework_compatibility_matrix.xml \ -ifeq ($(PRODUCT_USE_FASTBOOTD), true) -PRODUCT_PACKAGES += \ - fastbootd -endif - ifeq ($(TARGET_CORE_JARS),) $(error TARGET_CORE_JARS is empty; cannot initialize PRODUCT_BOOT_JARS variable) endif diff --git a/target/product/base_vendor.mk b/target/product/base_vendor.mk index c0728d8e4..e2a5a197d 100644 --- a/target/product/base_vendor.mk +++ b/target/product/base_vendor.mk @@ -24,12 +24,6 @@ PRODUCT_PACKAGES += \ shell_and_utilities_recovery \ watchdogd.recovery \ -ifeq ($(PRODUCT_USE_FASTBOOTD), true) -PRODUCT_PACKAGES += \ - android.hardware.boot@1.0-impl.recovery \ - bootctrl.default.recovery -endif - # Base modules and settings for the vendor partition. PRODUCT_PACKAGES += \ android.hardware.cas@1.0-service \ diff --git a/target/product/mainline_system.mk b/target/product/mainline_system.mk index 2854d54fe..74a3b1937 100644 --- a/target/product/mainline_system.mk +++ b/target/product/mainline_system.mk @@ -43,33 +43,6 @@ _base_mk_whitelist := \ recovery/root/system/lib64/libselinux.so \ recovery/root/system/lib64/libz.so \ -ifeq ($(PRODUCT_USE_FASTBOOTD), true) - _base_mk_whitelist += \ - recovery/root/system/bin/fastbootd \ - recovery/root/system/lib64/android.hardware.boot@1.0.so \ - recovery/root/system/lib64/hw/bootctrl.default.so \ - recovery/root/system/lib64/libadbd.so \ - recovery/root/system/lib64/libadbd_services.so \ - recovery/root/system/lib64/libasyncio.so \ - recovery/root/system/lib64/libbootloader_message.so \ - recovery/root/system/lib64/libcrypto_utils.so \ - recovery/root/system/lib64/libext2_uuid.so \ - recovery/root/system/lib64/libext4_utils.so \ - recovery/root/system/lib64/libfec.so \ - recovery/root/system/lib64/libfec_rs.so \ - recovery/root/system/lib64/libfs_mgr.so \ - recovery/root/system/lib64/libhidlbase.so \ - recovery/root/system/lib64/libhidltransport.so \ - recovery/root/system/lib64/libhwbinder.so \ - recovery/root/system/lib64/libkeyutils.so \ - recovery/root/system/lib64/liblogwrap.so \ - recovery/root/system/lib64/liblp.so \ - recovery/root/system/lib64/libmdnssd.so \ - recovery/root/system/lib64/libsparse.so \ - recovery/root/system/lib64/libsquashfs_utils.so \ - recovery/root/system/lib64/libutils.so -endif - _my_whitelist := $(_base_mk_whitelist) # Both /system and / are in system.img when PRODUCT_SHIPPING_API_LEVEL>=28.