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

Revert "HACK: report CPU abi as 2nd arch if present" 

This reverts commits 8179d4dcf6,
00c67a0568, and
d00c0a2e20.

Bug: 15933961
This commit is contained in:
Colin Cross 2014-08-05 10:54:14 -07:00
parent 56d91dd07f
commit ef77e517f7
2 changed files with 3 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/Makefile
View File

@ -219,8 +219,6 @@ endif
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), \

13
tools/buildinfo.sh
View File

@ -26,16 +26,9 @@ echo "ro.product.board=$TARGET_BOOTLOADER_BOARD_NAME"
# 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"