Revert "HACK: report CPU abi as 2nd arch if present"
This reverts commits 8179d4dcf658f195aa21040b88cc0e70e66cdcd5,
00c67a056837b5ebda1bda950265a1fa086b4e53, and
d00c0a2e20c5df26066d44175a8da29ccf4e76a6.
Bug: 15933961
diff --git a/core/Makefile b/core/Makefile
index c556ed7..ba893ee 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -219,8 +219,6 @@
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 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"