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

Commit 19b81454 authored by Ying Wang's avatar Ying Wang Committed by Android (Google) Code Review
Browse files

Merge "Set PRIVATE_TARGET_AAPT_CHARACTERISTICS even when running with the old aapt" into nyc-dev

parents eda71810 6f9bd2a9

core/java_common.mk

+7 −6
Original line number Diff line number Diff line
@@ -273,6 +273,7 @@ endif 
endif



$(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)

core/package_internal.mk

+0 −1
Original line number Diff line number Diff line
@@ -337,7 +337,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