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

Commit 6f9bd2a9 authored by Ying Wang's avatar Ying Wang
Browse files

Set PRIVATE_TARGET_AAPT_CHARACTERISTICS even when running with the old aapt 

In commit e758f931 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
parent f9d68500

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
@@ -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