Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ef77e517 authored by Colin Cross's avatar Colin Cross
Browse files

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

This reverts commits 8179d4dc,
00c67a05, and
d00c0a2e.

Bug: 15933961
parent 56d91dd0

core/Makefile

+0 −2
Original line number Diff line number Diff line
@@ -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), \

tools/buildinfo.sh

+3 −10
Original line number Diff line number Diff line
@@ -26,17 +26,10 @@ 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

fi

echo "ro.product.cpu.abilist=$TARGET_CPU_ABI_LIST"

echo "ro.product.cpu.abilist32=$TARGET_CPU_ABI_LIST_32_BIT"

echo "ro.product.cpu.abilist64=$TARGET_CPU_ABI_LIST_64_BIT"