commit ef77e517f7733543a6bdde50cab7f4b5d9858e51
author Colin Cross <ccross@android.com> Tue Aug 05 10:54:14 2014 -0700
committer Colin Cross <ccross@android.com> Tue Aug 05 11:01:54 2014 -0700
tree 0c3231ae69f21224e1030ab187df84ada36e0a58
parent 56d91dd07f96039344d6976da5d985d2508c9365

Revert "HACK: report CPU abi as 2nd arch if present"

This reverts commits 8179d4dcf658f195aa21040b88cc0e70e66cdcd5,
00c67a056837b5ebda1bda950265a1fa086b4e53, and
d00c0a2e20c5df26066d44175a8da29ccf4e76a6.

Bug: 15933961

tools/buildinfo.sh

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 @@
 # 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"