diff options
| author | Colin Cross <ccross@android.com> | 2014-08-05 10:54:14 -0700 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2014-08-05 11:01:54 -0700 |
| commit | ef77e517f7733543a6bdde50cab7f4b5d9858e51 (patch) | |
| tree | 0c3231ae69f21224e1030ab187df84ada36e0a58 /tools/buildinfo.sh | |
| parent | 56d91dd07f96039344d6976da5d985d2508c9365 (diff) | |
| download | build-ef77e517f7733543a6bdde50cab7f4b5d9858e51.zip build-ef77e517f7733543a6bdde50cab7f4b5d9858e51.tar.gz build-ef77e517f7733543a6bdde50cab7f4b5d9858e51.tar.bz2 | |
Revert "HACK: report CPU abi as 2nd arch if present"
This reverts commits 8179d4dcf658f195aa21040b88cc0e70e66cdcd5,
00c67a056837b5ebda1bda950265a1fa086b4e53, and
d00c0a2e20c5df26066d44175a8da29ccf4e76a6.
Bug: 15933961
Diffstat (limited to 'tools/buildinfo.sh')
| -rwxr-xr-x | tools/buildinfo.sh | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/tools/buildinfo.sh b/tools/buildinfo.sh index 2767496..593e5b5 100755 --- a/tools/buildinfo.sh +++ b/tools/buildinfo.sh @@ -26,16 +26,9 @@ 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." -if [ "$TARGET_2ND_CPU_ABI" = "armeabi-v7a" ] ; 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 +echo "ro.product.cpu.abi=$TARGET_CPU_ABI" +if [ -n "$TARGET_CPU_ABI2" ] ; then + echo "ro.product.cpu.abi2=$TARGET_CPU_ABI2" fi echo "ro.product.cpu.abilist=$TARGET_CPU_ABI_LIST" echo "ro.product.cpu.abilist32=$TARGET_CPU_ABI_LIST_32_BIT" |