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

Commit a9d3d3a9 authored by Hridya Valsaraju's avatar Hridya Valsaraju Committed by android-build-merger
Browse files

Merge "Add fastbootd to build targets" 

am: c76b000a

Change-Id: Ia6895921c28e05a3d8fe13ac8b6f37a02064d518
parents ce916fb4 c76b000a

target/product/base_system.mk

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

+27 −0
Original line number Diff line number Diff line
@@ -43,6 +43,33 @@ _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.