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

Commit e1b43254 authored by Ying Wang's avatar Ying Wang Committed by Gerrit Code Review
Browse files

Merge "Add --pseudo-localize aapt parameter for builds."

parents 432cd6dd c4dfe6ef

core/base_rules.mk

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




# Propagate local configuration options to this target.

# Propagate local configuration options to this target.

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

$(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_JAVA_LIBRARIES:= $(LOCAL_JAVA_LIBRARIES)

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

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

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

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

core/product_config.mk

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

PRODUCT_AAPT_PREF_CONFIG := \

    $(subst $(space),$(comma),$(strip $(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_BRAND := $(strip $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_BRAND))





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

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