diff options
| author | Dan Willemsen <dwillemsen@google.com> | 2016-07-08 18:08:51 -0700 |
|---|---|---|
| committer | gitbuildkicker <android-build@google.com> | 2016-10-12 19:42:31 -0700 |
| commit | dfca6cdfd32bd0d045355748b30992cd2e378d05 (patch) | |
| tree | deb62870d58e9f341fedc95e3fbf02a17bf0af5c | |
| parent | 098264084f12fe8baa7eb911e8c7cc64ce83b2a7 (diff) | |
| download | core-nougat-dr1-release.tar.gz | |
Use BOARD_USES_VENDORIMAGE to detect vendor image presence - DO NOT MERGEandroid-7.1.0_r7android-7.1.0_r6android-7.1.0_r5nougat-dr1-release
When building without vendor/... in the tree, we won't be creating a
vendorimage, so BOARD_VENDORIMAGE_FILE_SYSTEM_TYPE won't be defined. But
we still need to use the vendor image that will be present.
Bug: 31545062
Bug: 30040825
Change-Id: I756adc615aea11da60da4d3a4568caca9fed93ab
(cherry picked from commit 15366542057e7599d8514e9aee602d022c2ea14d)
| -rw-r--r-- | CleanSpec.mk | 1 | ||||
| -rw-r--r-- | rootdir/Android.mk | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/CleanSpec.mk b/CleanSpec.mk index b3661e4e7..5d335b5a8 100644 --- a/CleanSpec.mk +++ b/CleanSpec.mk @@ -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) diff --git a/rootdir/Android.mk b/rootdir/Android.mk index 94f5cb7fb..aa5a52092 100644 --- a/rootdir/Android.mk +++ b/rootdir/Android.mk @@ -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 |