From ef77e517f7733543a6bdde50cab7f4b5d9858e51 Mon Sep 17 00:00:00 2001
From: Colin Cross <ccross@android.com>
Date: Tue, 5 Aug 2014 10:54:14 -0700
Subject: [PATCH] Revert "HACK: report CPU abi as 2nd arch if present"

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

Bug: 15933961
---
 core/Makefile      |  2 --
 tools/buildinfo.sh | 13 +++----------
 2 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/core/Makefile b/core/Makefile
index c556ed780..ba893ee2a 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -219,8 +219,6 @@ endif
 			TARGET_CPU_ABI_LIST_64_BIT="$(TARGET_CPU_ABI_LIST_64_BIT)" \
 			TARGET_CPU_ABI="$(TARGET_CPU_ABI)" \
 			TARGET_CPU_ABI2="$(TARGET_CPU_ABI2)" \
-			TARGET_2ND_CPU_ABI="$(TARGET_2ND_CPU_ABI)" \
-			TARGET_2ND_CPU_ABI2="$(TARGET_2ND_CPU_ABI2)" \
 			TARGET_AAPT_CHARACTERISTICS="$(TARGET_AAPT_CHARACTERISTICS)" \
 	        bash $(BUILDINFO_SH) >> $@
 	$(hide) $(foreach file,$(system_prop_file), \
diff --git a/tools/buildinfo.sh b/tools/buildinfo.sh
index 276749689..593e5b5a4 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"