From 55dcf71d43bb35511d60a5459adbb79af8b1b5a9 Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Tue, 6 Mar 2018 17:18:54 -0800 Subject: [PATCH] Remove missed PRODUCT_AAPT_FLAGS PRODUCT_AAPT_FLAGS was removed by Iacc914114616b5bd19d9a1011802f4f9bca9bc19, remove one more that it missed. Bug: 73885582 Test: m checkbuild Change-Id: I31ea4954f5af5af37f13210925ed5d622625d71b Merged-In: I31ea4954f5af5af37f13210925ed5d622625d71b (cherry picked from commit 8dad6c62d458ca51333622ffac6a703943699fc9) --- core/java_common.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/java_common.mk b/core/java_common.mk index c97653b7ea..4e9d6855d4 100644 --- a/core/java_common.mk +++ b/core/java_common.mk @@ -428,7 +428,7 @@ aapt_flags := endif endif -$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_AAPT_FLAGS := $(LOCAL_AAPT_FLAGS) $(PRODUCT_AAPT_FLAGS) +$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_AAPT_FLAGS := $(LOCAL_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)