diff --git a/tools/buildinfo.sh b/tools/buildinfo.sh
index 593e5b5..ed60d8d 100755
--- a/tools/buildinfo.sh
+++ b/tools/buildinfo.sh
@@ -26,9 +26,16 @@
 # instead (see below).
 echo "# ro.product.cpu.abi and ro.product.cpu.abi2 are obsolete,"
 echo "# use ro.product.cpu.abilist instead."
-echo "ro.product.cpu.abi=$TARGET_CPU_ABI"
-if [ -n "$TARGET_CPU_ABI2" ] ; then
-  echo "ro.product.cpu.abi2=$TARGET_CPU_ABI2"
+if [ -n "TARGET_2ND_CPU_ABI" ] ; 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
 fi
 echo "ro.product.cpu.abilist=$TARGET_CPU_ABI_LIST"
 echo "ro.product.cpu.abilist32=$TARGET_CPU_ABI_LIST_32_BIT"