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

Commit a1e35a5f authored by Dan Willemsen's avatar Dan Willemsen Committed by android-build-merger
Browse files

Use BOARD_USES_VENDORIMAGE to detect vendor image presence - DO NOT MERGE 

am: 15366542

Change-Id: Idb1bea870de3251d7fa9682526e9634fe965424d
parents 1723f3fc 15366542

CleanSpec.mk

+1 −0
Original line number Diff line number Diff line
@@ -56,3 +56,4 @@ $(call add-clean-step, rm -rf $(PRODUCT_OUT)/recovery/root/default.prop) 
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/EXECUTABLES/lmkd_intermediates/import_includes)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/SHARED_LIBRARIES/libsysutils_intermediates/import_includes)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/bin/grep $(PRODUCT_OUT)/system/bin/toolbox)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/root/vendor)

rootdir/Android.mk

+1 −1
Original line number Diff line number Diff line
@@ -125,7 +125,7 @@ LOCAL_POST_INSTALL_CMD := mkdir -p $(addprefix $(TARGET_ROOT_OUT)/, \ 
    ln -sf /system/etc $(TARGET_ROOT_OUT)/etc; \

    ln -sf /sys/kernel/debug $(TARGET_ROOT_OUT)/d; \

    ln -sf /storage/self/primary $(TARGET_ROOT_OUT)/sdcard

ifdef BOARD_VENDORIMAGE_FILE_SYSTEM_TYPE

ifdef BOARD_USES_VENDORIMAGE

  LOCAL_POST_INSTALL_CMD += ; mkdir -p $(TARGET_ROOT_OUT)/vendor

else

  LOCAL_POST_INSTALL_CMD += ; ln -sf /system/vendor $(TARGET_ROOT_OUT)/vendor