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

Commit f6811abe authored by Narayan Kamath's avatar Narayan Kamath Committed by Android Git Automerger
Browse files

am 9fbd3afd: am 431b4bb3: Merge "Extend the CPU ABI specification mechanism." 

* commit '9fbd3afd':
  Extend the CPU ABI specification mechanism.
parents 7803fde3 9fbd3afd

core/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -191,6 +191,7 @@ $(INSTALLED_BUILD_PROP_TARGET): $(BUILDINFO_SH) $(INTERNAL_BUILD_ID_MAKEFILE) $( 
			TARGET_BOOTLOADER_BOARD_NAME="$(TARGET_BOOTLOADER_BOARD_NAME)" \

			BUILD_FINGERPRINT="$(BUILD_FINGERPRINT)" \

			TARGET_BOARD_PLATFORM="$(TARGET_BOARD_PLATFORM)" \

			TARGET_CPU_ABI_LIST="$(TARGET_CPU_ABI_LIST)" \

			TARGET_CPU_ABI="$(TARGET_CPU_ABI)" \

			TARGET_CPU_ABI2="$(TARGET_CPU_ABI2)" \

			TARGET_AAPT_CHARACTERISTICS="$(TARGET_AAPT_CHARACTERISTICS)" \

core/envsetup.mk

+22 −0
Original line number Diff line number Diff line
@@ -143,6 +143,28 @@ endif 
TARGET_DEVICE_DIR := $(patsubst %/,%,$(dir $(board_config_mk)))

board_config_mk :=



# "ro.product.cpu.abilist" is a comma separated list of ABIs (in order

# of preference) that the target supports. If a TARGET_CPU_ABI_LIST

# is specified by the board configuration, we use that. If not, we

# build a list out of the TARGET_CPU_ABIs specified by the config.

ifeq (,$(TARGET_CPU_ABI_LIST))

  TARGET_CPU_ABI_LIST := $(TARGET_CPU_ABI)

  ifneq (,$(TARGET_CPU_ABI2))

    TARGET_CPU_ABI_LIST += ,$(TARGET_CPU_ABI2)

  endif

  ifneq (,$(TARGET_2ND_CPU_ABI))

    TARGET_CPU_ABI_LIST += ,$(TARGET_2ND_CPU_ABI)

  endif

  ifneq (,$(TARGET_2ND_CPU_ABI2))

    TARGET_CPU_ABI_LIST += ,$(TARGET_2ND_CPU_ABI2)

  endif



  # Strip whitespace from the ABI list string.

  empty :=

  space := $(empty) $(empty)

  TARGET_CPU_ABI_LIST := $(subst $(space),,$(TARGET_CPU_ABI_LIST))

endif



# ---------------------------------------------------------------

# Set up configuration for target machine.

# The following must be set:

tools/buildinfo.sh

+7 −0
Original line number Diff line number Diff line
@@ -20,10 +20,17 @@ echo "ro.product.brand=$PRODUCT_BRAND" 
echo "ro.product.name=$PRODUCT_NAME"

echo "ro.product.device=$TARGET_DEVICE"

echo "ro.product.board=$TARGET_BOOTLOADER_BOARD_NAME"



# These values are deprecated, use "ro.product.cpu.abilist"

# 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"

fi

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



echo "ro.product.manufacturer=$PRODUCT_MANUFACTURER"

if [ -n "$PRODUCT_DEFAULT_LANGUAGE" ] ; then

  echo "ro.product.locale.language=$PRODUCT_DEFAULT_LANGUAGE"