diff options
| author | Abhishek G <agilra@cyngn.com> | 2016-04-04 17:03:24 -0700 |
|---|---|---|
| committer | Abhishek G <agilra@cyngn.com> | 2016-04-05 13:40:06 -0700 |
| commit | 85fe6388fec3c57726e84724d565ce793990f4bc (patch) | |
| tree | 292acb1299df5104843ac189ab8e95891fda9416 | |
| parent | 0e4ff26768df919c052d2145afed3e5534a0d889 (diff) | |
| download | build-85fe6388fec3c57726e84724d565ce793990f4bc.zip build-85fe6388fec3c57726e84724d565ce793990f4bc.tar.gz build-85fe6388fec3c57726e84724d565ce793990f4bc.tar.bz2 | |
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
| -rw-r--r-- | core/Makefile | 1 | ||||
| -rw-r--r-- | core/product.mk | 3 | ||||
| -rwxr-xr-x | tools/buildinfo.sh | 2 |
3 files changed, 5 insertions, 1 deletions
diff --git a/core/Makefile b/core/Makefile index 583e79d..5177476 100644 --- a/core/Makefile +++ b/core/Makefile @@ -248,6 +248,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 427fd83..b9cb556 100644 --- a/core/product.mk +++ b/core/product.mk @@ -327,6 +327,9 @@ _product_stash_var_list += \ GLOBAL_CFLAGS_NO_OVERRIDE \ GLOBAL_CPPFLAGS_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 559cd88..c621859 100755 --- a/tools/buildinfo.sh +++ b/tools/buildinfo.sh @@ -37,7 +37,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" |