diff options
Diffstat (limited to 'core')
| -rw-r--r-- | core/Makefile | 1 | ||||
| -rw-r--r-- | core/envsetup.mk | 22 |
2 files changed, 23 insertions, 0 deletions
diff --git a/core/Makefile b/core/Makefile index d487227..3573928 100644 --- a/core/Makefile +++ b/core/Makefile @@ -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)" \ diff --git a/core/envsetup.mk b/core/envsetup.mk index 4cb389b..628c95b 100644 --- a/core/envsetup.mk +++ b/core/envsetup.mk @@ -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: |