diff options
| author | Ying Wang <wangying@google.com> | 2010-04-27 15:45:35 -0700 |
|---|---|---|
| committer | Ying Wang <wangying@google.com> | 2010-07-20 18:10:17 -0700 |
| commit | 77c882ff88686d3cd312e7ed752ddcd7ad93a169 (patch) | |
| tree | d8e6e0ed767c86818e65c2e294fe093424b301cb /tools/buildinfo.sh | |
| parent | c06243d1953c6e62238066c60486db70aa3a3b30 (diff) | |
| download | build-77c882ff88686d3cd312e7ed752ddcd7ad93a169.zip build-77c882ff88686d3cd312e7ed752ddcd7ad93a169.tar.gz build-77c882ff88686d3cd312e7ed752ddcd7ad93a169.tar.bz2 | |
Allow PRODUCT_PROPERTY_OVERRIDES to override default locale.
Change-Id: I5147d687750a50cfc186e99a9a8c88d3b2eb1692
If PRODUCT_PROPERTY_OVERRIDES has set default locale, buildinfo.sh skips setting them.
http://b/issue?id=2243115
Diffstat (limited to 'tools/buildinfo.sh')
| -rwxr-xr-x | tools/buildinfo.sh | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/tools/buildinfo.sh b/tools/buildinfo.sh index 6c85149..ce3ee81 100755 --- a/tools/buildinfo.sh +++ b/tools/buildinfo.sh @@ -25,8 +25,12 @@ if [ -n "$TARGET_CPU_ABI2" ] ; then echo "ro.product.cpu.abi2=$TARGET_CPU_ABI2" fi echo "ro.product.manufacturer=$PRODUCT_MANUFACTURER" -echo "ro.product.locale.language=$PRODUCT_DEFAULT_LANGUAGE" -echo "ro.product.locale.region=$PRODUCT_DEFAULT_REGION" +if [ -n "$PRODUCT_DEFAULT_LANGUAGE" ] ; then + echo "ro.product.locale.language=$PRODUCT_DEFAULT_LANGUAGE" +fi +if [ -n "$PRODUCT_DEFAULT_REGION" ] ; then + echo "ro.product.locale.region=$PRODUCT_DEFAULT_REGION" +fi echo "ro.wifi.channels=$PRODUCT_DEFAULT_WIFI_CHANNELS" echo "ro.board.platform=$TARGET_BOARD_PLATFORM" |