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

Commit c4dfe6ef authored by Igor Viarheichyk's avatar Igor Viarheichyk Committed by Ying Wang
Browse files

Add --pseudo-localize aapt parameter for builds. 

Some packages can override list of locales with
LOCAL_AAPT_INCLUDE_ALL_RESOURCES parameter, disabling
pseudolocalization. Adding new --pseudo-localize flag to
aapt if pseudo-locales are specified in product locales
list solves this issue.

Change-Id: Iae705d4fe99453650339fd1ca65d1005671b3e4f
parent 432cd6dd

core/base_rules.mk

+1 −1
Original line number Diff line number Diff line
@@ -499,7 +499,7 @@ endif 


# Propagate local configuration options to this target.

$(LOCAL_INTERMEDIATE_TARGETS) : PRIVATE_PATH:=$(LOCAL_PATH)

$(LOCAL_INTERMEDIATE_TARGETS) : PRIVATE_AAPT_FLAGS:= $(LOCAL_AAPT_FLAGS)

$(LOCAL_INTERMEDIATE_TARGETS) : PRIVATE_AAPT_FLAGS:= $(LOCAL_AAPT_FLAGS) $(PRODUCT_AAPT_FLAGS)

$(LOCAL_INTERMEDIATE_TARGETS) : PRIVATE_JAVA_LIBRARIES:= $(LOCAL_JAVA_LIBRARIES)

$(LOCAL_INTERMEDIATE_TARGETS) : PRIVATE_MANIFEST_PACKAGE_NAME:= $(LOCAL_MANIFEST_PACKAGE_NAME)

$(LOCAL_INTERMEDIATE_TARGETS) : PRIVATE_MANIFEST_INSTRUMENTATION_FOR:= $(LOCAL_MANIFEST_INSTRUMENTATION_FOR)

core/product_config.mk

+7 −0
Original line number Diff line number Diff line
@@ -324,6 +324,13 @@ PRODUCT_AAPT_CONFIG := \ 
PRODUCT_AAPT_PREF_CONFIG := \

    $(subst $(space),$(comma),$(strip $(PRODUCT_AAPT_PREF_CONFIG)))



# product-scoped aapt flags

PRODUCT_AAPT_FLAGS :=

ifneq ($(filter en_XA ar_XB,$(PRODUCT_LOCALES)),)

# Force generating resources for pseudo-locales.

PRODUCT_AAPT_FLAGS += --pseudo-localize

endif



PRODUCT_BRAND := $(strip $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_BRAND))



PRODUCT_MODEL := $(strip $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_MODEL))