summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorAbhishek G <agilra@cyngn.com>2016-04-04 17:03:24 -0700
committerAbhishek G <agilra@cyngn.com>2016-04-05 13:40:06 -0700
commit85fe6388fec3c57726e84724d565ce793990f4bc (patch)
tree292acb1299df5104843ac189ab8e95891fda9416 /tools
parent0e4ff26768df919c052d2145afed3e5534a0d889 (diff)
downloadbuild-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
Diffstat (limited to 'tools')
-rwxr-xr-xtools/buildinfo.sh2
1 files changed, 1 insertions, 1 deletions
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"