From d00c0a2e20c5df26066d44175a8da29ccf4e76a6 Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Thu, 26 Jun 2014 13:05:29 -0700 Subject: 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 --- tools/buildinfo.sh | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) (limited to 'tools/buildinfo.sh') diff --git a/tools/buildinfo.sh b/tools/buildinfo.sh index 593e5b5a4..ed60d8d63 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" -- cgit v1.2.3