From 6f9bd2a97270bda82a98e560877e00de1880d637 Mon Sep 17 00:00:00 2001 From: Ying Wang Date: Tue, 29 Mar 2016 12:41:42 -0700 Subject: [PATCH] Set PRIVATE_TARGET_AAPT_CHARACTERISTICS even when running with the old aapt In commit e758f9319dcb6cc9693af03cc03d385167a35a8d we switched from TARGET_AAPT_CHARACTERISTICS to PRIVATE_TARGET_AAPT_CHARACTERISTICS in add-assets-to-package but forgot to set the variable when we are running the old aapt. Bug: 27874886 Change-Id: I03ced3030dcb9f024eef5b23dbfd5d99157952ea --- core/java_common.mk | 13 +++++++------ core/package_internal.mk | 1 - 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/core/java_common.mk b/core/java_common.mk index 71f571010..e3574401d 100644 --- a/core/java_common.mk +++ b/core/java_common.mk @@ -272,9 +272,10 @@ aapt_flags := endif endif -$(LOCAL_INTERMEDIATE_TARGETS) : PRIVATE_AAPT_FLAGS := $(LOCAL_AAPT_FLAGS) $(PRODUCT_AAPT_FLAGS) -$(LOCAL_INTERMEDIATE_TARGETS) : PRIVATE_MANIFEST_PACKAGE_NAME := $(LOCAL_MANIFEST_PACKAGE_NAME) -$(LOCAL_INTERMEDIATE_TARGETS) : PRIVATE_MANIFEST_INSTRUMENTATION_FOR := $(LOCAL_MANIFEST_INSTRUMENTATION_FOR) +$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_AAPT_FLAGS := $(LOCAL_AAPT_FLAGS) $(PRODUCT_AAPT_FLAGS) +$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_TARGET_AAPT_CHARACTERISTICS := $(TARGET_AAPT_CHARACTERISTICS) +$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_MANIFEST_PACKAGE_NAME := $(LOCAL_MANIFEST_PACKAGE_NAME) +$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_MANIFEST_INSTRUMENTATION_FOR := $(LOCAL_MANIFEST_INSTRUMENTATION_FOR) ifdef aidl_sources ALL_MODULES.$(my_register_name).AIDL_FILES := $(aidl_sources) @@ -284,7 +285,7 @@ ALL_MODULES.$(my_register_name).RS_FILES := $(renderscript_sources_fullpath) endif endif # !LOCAL_IS_HOST_MODULE -$(LOCAL_INTERMEDIATE_TARGETS) : PRIVATE_ALL_JAVA_LIBRARIES := $(full_java_libs) +$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_ALL_JAVA_LIBRARIES := $(full_java_libs) ALL_MODULES.$(my_register_name).INTERMEDIATE_SOURCE_DIR := \ $(ALL_MODULES.$(my_register_name).INTERMEDIATE_SOURCE_DIR) $(LOCAL_INTERMEDIATE_SOURCE_DIR) @@ -381,8 +382,8 @@ endif # LOCAL_INSTRUMENTATION_FOR endif # !LOCAL_IS_HOST_MODULE # Propagate local configuration options to this target. -$(LOCAL_INTERMEDIATE_TARGETS) : PRIVATE_ALL_JACK_LIBRARIES:= $(full_jack_libs) -$(LOCAL_INTERMEDIATE_TARGETS) : PRIVATE_JARJAR_RULES := $(LOCAL_JARJAR_RULES) +$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_ALL_JACK_LIBRARIES:= $(full_jack_libs) +$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_JARJAR_RULES := $(LOCAL_JARJAR_RULES) endif # need_compile_java endif # LOCAL_JACK_ENABLED diff --git a/core/package_internal.mk b/core/package_internal.mk index fb21c2b5e..c154f97ab 100644 --- a/core/package_internal.mk +++ b/core/package_internal.mk @@ -331,7 +331,6 @@ my_generated_res_dirs := $(rs_generated_res_dir) my_generated_res_dirs_deps := $(RenderScript_file_stamp) # Add AAPT2 link specific flags. $(my_res_package): PRIVATE_AAPT_FLAGS := $(LOCAL_AAPT_FLAGS) --no-static-lib-packages -$(my_res_package): PRIVATE_TARGET_AAPT_CHARACTERISTICS := $(TARGET_AAPT_CHARACTERISTICS) include $(BUILD_SYSTEM)/aapt2.mk else # LOCAL_USE_AAPT2