diff options
| -rw-r--r-- | core/base_rules.mk | 1 | ||||
| -rw-r--r-- | core/clear_vars.mk | 2 | ||||
| -rw-r--r-- | core/definitions.mk | 4 |
3 files changed, 5 insertions, 2 deletions
diff --git a/core/base_rules.mk b/core/base_rules.mk index f9a1fac..8598e7e 100644 --- a/core/base_rules.mk +++ b/core/base_rules.mk @@ -390,6 +390,7 @@ $(LOCAL_INTERMEDIATE_TARGETS) : PRIVATE_PATH:=$(LOCAL_PATH) $(LOCAL_INTERMEDIATE_TARGETS) : PRIVATE_POST_PROCESS_COMMAND:= $(LOCAL_POST_PROCESS_COMMAND) $(LOCAL_INTERMEDIATE_TARGETS) : PRIVATE_AAPT_FLAGS:= $(LOCAL_AAPT_FLAGS) $(LOCAL_INTERMEDIATE_TARGETS) : PRIVATE_JAVA_LIBRARIES:= $(LOCAL_JAVA_LIBRARIES) +$(LOCAL_INTERMEDIATE_TARGETS) : PRIVATE_MANIFEST_PACKAGE_NAME:= $(LOCAL_MANIFEST_PACKAGE_NAME) $(LOCAL_INTERMEDIATE_TARGETS) : PRIVATE_ALL_JAVA_LIBRARIES:= $(full_java_libs) $(LOCAL_INTERMEDIATE_TARGETS) : PRIVATE_IS_HOST_MODULE := $(LOCAL_IS_HOST_MODULE) diff --git a/core/clear_vars.mk b/core/clear_vars.mk index 6107808..0fe3c8b 100644 --- a/core/clear_vars.mk +++ b/core/clear_vars.mk @@ -19,7 +19,7 @@ LOCAL_MODULE_SUFFIX:= LOCAL_PACKAGE_NAME:= LOCAL_OVERRIDES_PACKAGES:= LOCAL_EXPORT_PACKAGE_RESOURCES:= -LOCAL_PACKAGE_MANIFEST_NAME:= +LOCAL_MANIFEST_PACKAGE_NAME:= LOCAL_REQUIRED_MODULES:= LOCAL_ACP_UNAVAILABLE:= LOCAL_MODULE_TAGS:= diff --git a/core/definitions.mk b/core/definitions.mk index d45e8dd..5169b71 100644 --- a/core/definitions.mk +++ b/core/definitions.mk @@ -1233,7 +1233,8 @@ $(hide) $(AAPT) package $(PRIVATE_AAPT_FLAGS) -m -z \ $(addprefix --min-sdk-version , $(DEFAULT_APP_TARGET_SDK)) \ $(addprefix --target-sdk-version , $(DEFAULT_APP_TARGET_SDK)) \ $(addprefix --version-code , $(PLATFORM_SDK_VERSION)) \ - $(addprefix --version-name , $(PLATFORM_VERSION)) + $(addprefix --version-name , $(PLATFORM_VERSION)) \ + $(addprefix --rename-manifest-package , $(PRIVATE_MANIFEST_PACKAGE_NAME)) endef ifeq ($(HOST_OS),windows) @@ -1376,6 +1377,7 @@ $(hide) $(AAPT) package -z -u $(PRIVATE_AAPT_FLAGS) \ $(addprefix --target-sdk-version , $(DEFAULT_APP_TARGET_SDK)) \ $(addprefix --version-code , $(PLATFORM_SDK_VERSION)) \ $(addprefix --version-name , $(PLATFORM_VERSION)) \ + $(addprefix --rename-manifest-package , $(PRIVATE_MANIFEST_PACKAGE_NAME)) \ -F $@ endef |