HACK: report CPU abi as 2nd arch if present
Workaround to report armv7 abis for arm64 devices until the play store
looks at the new android.os.Build.SUPPORTED_ABIS list.
Bug: 15018047
Change-Id: If5f4081073ee80433aae51ef15ccbfa1c6ae624c
diff --git a/core/Makefile b/core/Makefile
index b02604f..12d4915 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -212,6 +212,8 @@
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 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"