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

Commit 8f5fc9e2 authored by Narayan Kamath's avatar Narayan Kamath Committed by Gerrit Code Review
Browse files

Merge "Add ro.product.locale"

parents 8768c6b7 baf3eb93

CleanSpec.mk

+4 −0
Original line number Original line Diff line number Diff line
@@ -315,6 +315,10 @@ $(call add-clean-step, rm -rf $(PRODUCT_OUT)/recovery/root/default.prop) 
# an ABI change since the names will mangle differently.

# an ABI change since the names will mangle differently.

$(call add-clean-step, rm -rf $(OUT_DIR))

$(call add-clean-step, rm -rf $(OUT_DIR))





# Remove ro.product.locale.language/country and add ro.product.locale

# instead.

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/build.prop)



# ************************************************

# ************************************************

# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST

# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST

# ************************************************
 
# ************************************************

core/Makefile

+7 −25
Original line number Original line Diff line number Diff line
@@ -156,29 +156,12 @@ else 
  BUILD_DISPLAY_ID := $(build_desc)

  BUILD_DISPLAY_ID := $(build_desc)

endif

endif





# Whether there is default locale set in PRODUCT_PROPERTY_OVERRIDES

# Accepts a whitespace separated list of product locales such as

product_property_override_locale_language := $(strip \

# (en_US en_AU en_GB...) and returns the first locale in the list with

    $(patsubst ro.product.locale.language=%,%,\

# underscores replaced with hyphens. In the example above, this will

    $(filter ro.product.locale.language=%,$(PRODUCT_PROPERTY_OVERRIDES))))

# return "en-US".

product_property_overrides_locale_region := $(strip \

define get-default-product-locale

    $(patsubst ro.product.locale.region=%,%,\

$(strip $(subst _,-, $(firstword $(1))))

    $(filter ro.product.locale.region=%,$(PRODUCT_PROPERTY_OVERRIDES))))



# Selects the first locale in the list given as the argument,

# and splits it into language and region, which each may be

# empty.

define default-locale

$(subst _, , $(firstword $(1)))

endef



# Selects the first locale in the list given as the argument

# and returns the language (or the region), if it's not set in PRODUCT_PROPERTY_OVERRIDES;

# Return empty string if it's already set in PRODUCT_PROPERTY_OVERRIDES.

define default-locale-language

$(if $(product_property_override_locale_language),,$(word 1, $(call default-locale, $(1))))

endef

define default-locale-region

$(if $(product_property_overrides_locale_region),,$(word 2, $(call default-locale, $(1))))

endef

endef





BUILDINFO_SH := build/tools/buildinfo.sh

BUILDINFO_SH := build/tools/buildinfo.sh
@@ -203,8 +186,7 @@ endif 
			TARGET_DEVICE="$(TARGET_DEVICE)" \

			TARGET_DEVICE="$(TARGET_DEVICE)" \

			PRODUCT_NAME="$(TARGET_PRODUCT)" \

			PRODUCT_NAME="$(TARGET_PRODUCT)" \

			PRODUCT_BRAND="$(PRODUCT_BRAND)" \

			PRODUCT_BRAND="$(PRODUCT_BRAND)" \

			PRODUCT_DEFAULT_LANGUAGE="$(call default-locale-language,$(PRODUCT_LOCALES))" \

			PRODUCT_DEFAULT_LOCALE="$(call get-default-product-locale,$(PRODUCT_LOCALES))" \

			PRODUCT_DEFAULT_REGION="$(call default-locale-region,$(PRODUCT_LOCALES))" \

			PRODUCT_DEFAULT_WIFI_CHANNELS="$(PRODUCT_DEFAULT_WIFI_CHANNELS)" \

			PRODUCT_DEFAULT_WIFI_CHANNELS="$(PRODUCT_DEFAULT_WIFI_CHANNELS)" \

			PRODUCT_MODEL="$(PRODUCT_MODEL)" \

			PRODUCT_MODEL="$(PRODUCT_MODEL)" \

			PRODUCT_MANUFACTURER="$(PRODUCT_MANUFACTURER)" \

			PRODUCT_MANUFACTURER="$(PRODUCT_MANUFACTURER)" \

tools/buildinfo.sh

+2 −5
Original line number Original line Diff line number Diff line
@@ -35,11 +35,8 @@ echo "ro.product.cpu.abilist32=$TARGET_CPU_ABI_LIST_32_BIT" 
echo "ro.product.cpu.abilist64=$TARGET_CPU_ABI_LIST_64_BIT"

echo "ro.product.cpu.abilist64=$TARGET_CPU_ABI_LIST_64_BIT"





echo "ro.product.manufacturer=$PRODUCT_MANUFACTURER"

echo "ro.product.manufacturer=$PRODUCT_MANUFACTURER"

if [ -n "$PRODUCT_DEFAULT_LANGUAGE" ] ; then

if [ -n "$PRODUCT_DEFAULT_LOCALE" ] ; then

  echo "ro.product.locale.language=$PRODUCT_DEFAULT_LANGUAGE"

  echo "ro.product.locale=$PRODUCT_DEFAULT_LOCALE"

fi

if [ -n "$PRODUCT_DEFAULT_REGION" ] ; then

  echo "ro.product.locale.region=$PRODUCT_DEFAULT_REGION"

fi

fi

echo "ro.wifi.channels=$PRODUCT_DEFAULT_WIFI_CHANNELS"

echo "ro.wifi.channels=$PRODUCT_DEFAULT_WIFI_CHANNELS"

echo "ro.board.platform=$TARGET_BOARD_PLATFORM"

echo "ro.board.platform=$TARGET_BOARD_PLATFORM"