p96705831
/
platform_build
forked from openkylin/platform_build
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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
This commit is contained in:
Colin Cross 2014-06-26 13:05:29 -07:00
parent a26a2123b8
commit d00c0a2e20
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/Makefile
View File

@ -212,6 +212,8 @@ endif
TARGET_CPU_ABI_LIST_64_BIT="$(TARGET_CPU_ABI_LIST_64_BIT)" \ TARGET_CPU_ABI_LIST_64_BIT="$(TARGET_CPU_ABI_LIST_64_BIT)" \
TARGET_CPU_ABI="$(TARGET_CPU_ABI)" \ TARGET_CPU_ABI="$(TARGET_CPU_ABI)" \
TARGET_CPU_ABI2="$(TARGET_CPU_ABI2)" \ 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)" \ TARGET_AAPT_CHARACTERISTICS="$(TARGET_AAPT_CHARACTERISTICS)" \
bash $(BUILDINFO_SH) >> $@ bash $(BUILDINFO_SH) >> $@
$(hide) $(foreach file,$(system_prop_file), \ $(hide) $(foreach file,$(system_prop_file), \

13
tools/buildinfo.sh
View File

@ -26,9 +26,16 @@ echo "ro.product.board=$TARGET_BOOTLOADER_BOARD_NAME"
# instead (see below). # instead (see below).
echo "# ro.product.cpu.abi and ro.product.cpu.abi2 are obsolete," echo "# ro.product.cpu.abi and ro.product.cpu.abi2 are obsolete,"
echo "# use ro.product.cpu.abilist instead." echo "# use ro.product.cpu.abilist instead."
echo "ro.product.cpu.abi=$TARGET_CPU_ABI" if [ -n "TARGET_2ND_CPU_ABI" ] ; then
if [ -n "$TARGET_CPU_ABI2" ] ; then echo "ro.product.cpu.abi=$TARGET_2ND_CPU_ABI"
echo "ro.product.cpu.abi2=$TARGET_CPU_ABI2" 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 fi
echo "ro.product.cpu.abilist=$TARGET_CPU_ABI_LIST" echo "ro.product.cpu.abilist=$TARGET_CPU_ABI_LIST"
echo "ro.product.cpu.abilist32=$TARGET_CPU_ABI_LIST_32_BIT" echo "ro.product.cpu.abilist32=$TARGET_CPU_ABI_LIST_32_BIT"