commit 960de8efcd1d4faa5b0d25c91eb7f7f6fbf97693
author Adam Lesinski <adamlesinski@google.com> Wed Aug 16 15:52:53 2017 -0700
committer Colin Cross <ccross@android.com> Wed Mar 14 12:04:01 2018 -0700
tree 939c7c9060d74cc05f46edc43c81df5be9a784a7
parent a0c1cc97bd5ffea3c0a342028ef8124114faede7

Enable apps to build with resource namespaces

Setting LOCAL_AAPT_NAMESPACES := true enables
namespaces for an app and requires any library resources
to be fully qualified by their package.

Test: manual
Bug: 73885582
Change-Id: Ia6bfc82ee8b8d6335f8e7c2abe94ce36467a012d
Merged-In: Ia6bfc82ee8b8d6335f8e7c2abe94ce36467a012d

core/static_java_library.mk

diff --git a/core/static_java_library.mk b/core/static_java_library.mk
index 77bb498..d92d8c0 100644
--- a/core/static_java_library.mk
+++ b/core/static_java_library.mk
@@ -131,7 +131,10 @@
 # add --non-constant-id to prevent inlining constants.
 # AAR needs text symbol file R.txt.
 ifdef LOCAL_USE_AAPT2
-$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_AAPT_FLAGS := $(LOCAL_AAPT_FLAGS) --static-lib --no-static-lib-packages
+$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_AAPT_FLAGS := $(LOCAL_AAPT_FLAGS) --static-lib
+ifndef LOCAL_AAPT_NAMESPACES
+  $(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_AAPT_FLAGS += --no-static-lib-packages
+endif
 $(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_PRODUCT_AAPT_CONFIG :=
 $(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_PRODUCT_AAPT_PREF_CONFIG :=
 $(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_TARGET_AAPT_CHARACTERISTICS :=