Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6518cbda authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Correct PRODUCT_USE_FASTBOOTD USAGE"

parents 9be301eb e06e9746

target/product/base_system.mk

+0 −5
Original line number Diff line number Diff line
@@ -256,11 +256,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

target/product/base_vendor.mk

+0 −6
Original line number Diff line number Diff line
@@ -25,12 +25,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 \

target/product/mainline_system.mk

+0 −27
Original line number Diff line number Diff line
@@ -28,33 +28,6 @@ PRODUCT_SHIPPING_API_LEVEL := 28 
_base_mk_whitelist := \

  recovery/root/etc/mke2fs.conf \



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.