summaryrefslogtreecommitdiffstats
path: root/tools/buildinfo.sh
diff options
context:
space:
mode:
authorColin Cross <ccross@android.com>2014-06-26 13:05:29 -0700
committerColin Cross <ccross@android.com>2014-06-27 10:49:26 -0700
commitd00c0a2e20c5df26066d44175a8da29ccf4e76a6 (patch)
tree20490eb659d5074c1f120cae71d283cea2e39310 /tools/buildinfo.sh
parenta26a2123b80ad3b4aa3ab8d2d1648dc03ae230b2 (diff)
downloadbuild-d00c0a2e20c5df26066d44175a8da29ccf4e76a6.zip
build-d00c0a2e20c5df26066d44175a8da29ccf4e76a6.tar.gz
build-d00c0a2e20c5df26066d44175a8da29ccf4e76a6.tar.bz2
HACK: report CPU abi as 2nd arch if present
Workaround to report armv7 abis for arm64 devices until the play store looks at the new android.os.Build.SUPPORTED_ABIS list. Bug: 15018047 Change-Id: If5f4081073ee80433aae51ef15ccbfa1c6ae624c
Diffstat (limited to 'tools/buildinfo.sh')
-rwxr-xr-xtools/buildinfo.sh13
1 files changed, 10 insertions, 3 deletions
diff --git a/tools/buildinfo.sh b/tools/buildinfo.sh
index 593e5b5..ed60d8d 100755
--- a/tools/buildinfo.sh
+++ b/tools/buildinfo.sh
@@ -26,9 +26,16 @@ echo "ro.product.board=$TARGET_BOOTLOADER_BOARD_NAME"
# instead (see below).
echo "# ro.product.cpu.abi and ro.product.cpu.abi2 are obsolete,"
echo "# use ro.product.cpu.abilist instead."
-echo "ro.product.cpu.abi=$TARGET_CPU_ABI"
-if [ -n "$TARGET_CPU_ABI2" ] ; then
- echo "ro.product.cpu.abi2=$TARGET_CPU_ABI2"
+if [ -n "TARGET_2ND_CPU_ABI" ] ; then
+ echo "ro.product.cpu.abi=$TARGET_2ND_CPU_ABI"
+ if [ -n "$TARGET_2ND_CPU_ABI2" ] ; then
+ echo "ro.product.cpu.abi2=$TARGET_2ND_CPU_ABI2"
+ fi
+else
+ echo "ro.product.cpu.abi=$TARGET_CPU_ABI"
+ if [ -n "$TARGET_CPU_ABI2" ] ; then
+ echo "ro.product.cpu.abi2=$TARGET_CPU_ABI2"
+ fi
fi
echo "ro.product.cpu.abilist=$TARGET_CPU_ABI_LIST"
echo "ro.product.cpu.abilist32=$TARGET_CPU_ABI_LIST_32_BIT"