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

Commit 86d0b142 authored by Adam Lesinski's avatar Adam Lesinski
Browse files

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
Change-Id: Ia6bfc82ee8b8d6335f8e7c2abe94ce36467a012d
parent e18745ce

core/clear_vars.mk

+1 −0
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ 
LOCAL_32_BIT_ONLY:=

LOCAL_AAPT_FLAGS:=

LOCAL_AAPT_INCLUDE_ALL_RESOURCES:=

LOCAL_AAPT_NAMESPACES:=

LOCAL_ADDITIONAL_CERTIFICATES:=

LOCAL_ADDITIONAL_DEPENDENCIES:=

LOCAL_ADDITIONAL_HTML_DIR:=

core/package_internal.mk

+6 −1
Original line number Diff line number Diff line
@@ -406,8 +406,13 @@ endif # renderscript_target_api < 21 
endif  # renderscript_target_api is set

my_asset_dirs := $(LOCAL_ASSET_DIR)

my_full_asset_paths := $(all_assets)



# Add AAPT2 link specific flags.

$(my_res_package): PRIVATE_AAPT_FLAGS := $(LOCAL_AAPT_FLAGS) --no-static-lib-packages

$(my_res_package): PRIVATE_AAPT_FLAGS := $(LOCAL_AAPT_FLAGS)

ifndef LOCAL_AAPT_NAMESPACES

  $(my_res_package): PRIVATE_AAPT_FLAGS += --no-static-lib-packages

endif



include $(BUILD_SYSTEM)/aapt2.mk

else  # LOCAL_USE_AAPT2

core/static_java_library.mk

+4 −1
Original line number Diff line number Diff line
@@ -128,7 +128,10 @@ endif 
# 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 :=