From 4cf7cde9aa8aab116381737d5055cd5faeb24bff Mon Sep 17 00:00:00 2001 From: Michael Butler Date: Fri, 11 Jan 2019 20:24:25 +0000 Subject: [PATCH] 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 --- core/main.mk | 6 ------ 1 file changed, 6 deletions(-) diff --git a/core/main.mk b/core/main.mk index 0a99e7c844..282821cdbf 100644 --- a/core/main.mk +++ b/core/main.mk @@ -1089,12 +1089,6 @@ ifdef FULL_BUILD static_whitelist_patterns := $(TARGET_OUT_FAKE)/% $(HOST_OUT)/% # RROs become REQUIRED by the source module, but are always placed on the vendor partition. static_whitelist_patterns += %__auto_generated_rro.apk - # $(PRODUCT_OUT)/apex is where shared libraries in APEXes get installed. - # The path can be considered as a fake path, as the shared libraries - # are installed there just to have symbols files for them under - # $(PRODUCT_OUT)/symbols/apex for debugging purpose. The /apex directory - # is never compiled into a filesystem image. - static_whitelist_patterns += $(PRODUCT_OUT)/apex/% ifeq (true,$(BOARD_USES_SYSTEM_OTHER_ODEX)) # Allow system_other odex space optimization. static_whitelist_patterns += \