From 7ff326d8b05df431747d8d6353184ea70f44e9e4 Mon Sep 17 00:00:00 2001 From: Abhishek G Date: Mon, 4 Apr 2016 17:03:24 -0700 Subject: [PATCH] Preventing default locale from being overridden because of buildinfo.sh Adding the ability to set default locale from the device tree. Adding the TARGET_SKIP_DEFAULT_LOCALE flag which can be set in the device tree, thus preventing buildinfo.sh from overriding default locale. Change-Id: I66bcedb42216acee56ceaf657a39dc23d7eea6f4 Issue-Id: FEIJ-22 --- core/Makefile | 1 + core/product.mk | 3 +++ tools/buildinfo.sh | 2 +- 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/core/Makefile b/core/Makefile index f56d0d7fd..6c3275789 100644 --- a/core/Makefile +++ b/core/Makefile @@ -266,6 +266,7 @@ endif TARGET_CPU_ABI2="$(TARGET_CPU_ABI2)" \ TARGET_AAPT_CHARACTERISTICS="$(TARGET_AAPT_CHARACTERISTICS)" \ TARGET_UNIFIED_DEVICE="$(TARGET_UNIFIED_DEVICE)" \ + TARGET_SKIP_DEFAULT_LOCALE="$(TARGET_SKIP_DEFAULT_LOCALE)" \ $(PRODUCT_BUILD_PROP_OVERRIDES) \ bash $(BUILDINFO_SH) >> $@ $(hide) $(foreach file,$(system_prop_file), \ diff --git a/core/product.mk b/core/product.mk index 6e3404668..3a344d422 100644 --- a/core/product.mk +++ b/core/product.mk @@ -294,6 +294,9 @@ _product_stash_var_list += \ GLOBAL_CPPFLAGS_NO_OVERRIDE \ GLOBAL_CLANG_CFLAGS_NO_OVERRIDE \ +_product_stash_var_list += \ + TARGET_SKIP_DEFAULT_LOCALE \ + # # Stash values of the variables in _product_stash_var_list. # $(1): Renamed prefix diff --git a/tools/buildinfo.sh b/tools/buildinfo.sh index 039c344a4..b169c3d84 100755 --- a/tools/buildinfo.sh +++ b/tools/buildinfo.sh @@ -43,7 +43,7 @@ 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.manufacturer=$PRODUCT_MANUFACTURER" -if [ -n "$PRODUCT_DEFAULT_LOCALE" ] ; then +if [ -n "$PRODUCT_DEFAULT_LOCALE" ] && [ -z "$TARGET_SKIP_DEFAULT_LOCALE" ] ; then echo "ro.product.locale=$PRODUCT_DEFAULT_LOCALE" fi echo "ro.wifi.channels=$PRODUCT_DEFAULT_WIFI_CHANNELS" -- 2.11.0