aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Butler2019-01-11 14:24:25 -0600
committerMichael Butler2019-01-11 14:24:25 -0600
commit4cf7cde9aa8aab116381737d5055cd5faeb24bff (patch)
treef289ca6f030aa8030914af257859e16b2c3adcc0
parent3387e656861ebfaea8a1216674965ba13dcbbad3 (diff)
downloadplatform-build-4cf7cde9aa8aab116381737d5055cd5faeb24bff.tar.gz
platform-build-4cf7cde9aa8aab116381737d5055cd5faeb24bff.tar.xz
platform-build-4cf7cde9aa8aab116381737d5055cd5faeb24bff.zip
Revert "Add $(PRODUCT_OUT)/apex to the artifact path whitelist"
This reverts commit 3387e656861ebfaea8a1216674965ba13dcbbad3. Reason for revert: Topic likely causing build failure on aosp_x86_64-eng in aosp_master: "build/make/core/base_rules.mk:271: error: art/build/apex: MODULE.TARGET.SHARED_LIBRARIES.com.android.runtime.host.libart-compiler already defined by art/build/apex." Change-Id: I2033828e7a13062b72d1d66a7f289cf5bb12b776
-rw-r--r--core/main.mk6
1 files changed, 0 insertions, 6 deletions
diff --git a/core/main.mk b/core/main.mk
index 0a99e7c84..282821cdb 100644
--- a/core/main.mk
+++ b/core/main.mk
@@ -1089,12 +1089,6 @@ ifdef FULL_BUILD
1089 static_whitelist_patterns := $(TARGET_OUT_FAKE)/% $(HOST_OUT)/% 1089 static_whitelist_patterns := $(TARGET_OUT_FAKE)/% $(HOST_OUT)/%
1090 # RROs become REQUIRED by the source module, but are always placed on the vendor partition. 1090 # RROs become REQUIRED by the source module, but are always placed on the vendor partition.
1091 static_whitelist_patterns += %__auto_generated_rro.apk 1091 static_whitelist_patterns += %__auto_generated_rro.apk
1092 # $(PRODUCT_OUT)/apex is where shared libraries in APEXes get installed.
1093 # The path can be considered as a fake path, as the shared libraries
1094 # are installed there just to have symbols files for them under
1095 # $(PRODUCT_OUT)/symbols/apex for debugging purpose. The /apex directory
1096 # is never compiled into a filesystem image.
1097 static_whitelist_patterns += $(PRODUCT_OUT)/apex/%
1098 ifeq (true,$(BOARD_USES_SYSTEM_OTHER_ODEX)) 1092 ifeq (true,$(BOARD_USES_SYSTEM_OTHER_ODEX))
1099 # Allow system_other odex space optimization. 1093 # Allow system_other odex space optimization.
1100 static_whitelist_patterns += \ 1094 static_whitelist_patterns += \