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
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),\
diff --git a/core/product_config.mk b/core/product_config.mk
index fd61723..151dac0 100644
--- a/core/product_config.mk
+++ b/core/product_config.mk
@@ -299,9 +299,14 @@
# product-scoped aapt flags
PRODUCT_AAPT_FLAGS :=
+PRODUCT_AAPT2_CFLAGS :=
ifneq ($(filter en_XA ar_XB,$(PRODUCT_LOCALES)),)
-# Force generating resources for pseudo-locales.
-PRODUCT_AAPT_FLAGS += --pseudo-localize
+ # Force generating resources for pseudo-locales.
+ ifdef USE_AAPT2
+ PRODUCT_AAPT2_CFLAGS += --pseudo-localize
+ else
+ PRODUCT_AAPT_FLAGS += --pseudo-localize
+ endif
endif
PRODUCT_BRAND := $(strip $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_BRAND))