commit 497888de8c798463c076645e4b6bff81aab4bfc7
author Adam Lesinski <adamlesinski@google.com> Tue Jan 26 12:17:32 2016 -0800
committer Adam Lesinski <adamlesinski@google.com> Tue Jan 26 12:17:32 2016 -0800
tree 0e25fff631a54ad30a3c4bf663ed94ce0abb7f44
parent 97f48ebeab3d2b2129bd6973facec3feaee122d4

Use --pseudo-localize only with compile phase in AAPT2

AAPT2 does pseudo-localization in compile phase. Passing --pseudo-localize
to the link phase causes an error.
Bug:25958912

Change-Id: I6ced0979884cb0d718018f995f9b2f6476d401cb

core/aapt2.mk

diff --git a/core/aapt2.mk b/core/aapt2.mk
index d064d5f..5c4cf73 100644
--- a/core/aapt2.mk
+++ b/core/aapt2.mk
@@ -38,7 +38,7 @@
 endif
 
 $(my_res_resources_flat) $(my_overlay_resources_flat) $(my_generated_resources_flata): \
-  PRIVATE_AAPT2_CFLAGS := $(addprefix --product ,$(my_aapt_characteristics))
+  PRIVATE_AAPT2_CFLAGS := $(addprefix --product ,$(my_aapt_characteristics)) $(PRODUCT_AAPT2_CFLAGS)
 
 # Link the static library resource packages.
 my_static_library_resources := $(foreach l, $(LOCAL_STATIC_JAVA_LIBRARIES),\