commit f15ad97a0737ad42f663e1ca1702f6cf1831e532
author Dehao Chen <dehao@google.com> Wed Aug 06 03:06:49 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Aug 05 00:34:22 2014 +0000
tree e99e4bedde7fba067df499bbb30a0f95d52946cd
parent 8381b988698bf891add85608648dfe1cc0c599bc
parent da26f200bdedcd22ec8d84819cd2361ecf61cd1e

Merge "Change profile use path to the newly created project." into lmp-dev

core/Makefile

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), \

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"