diff options
| author | Narayan Kamath <narayan@google.com> | 2014-03-31 12:35:14 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-31 12:35:14 +0000 |
| commit | b4d757b1b2677ee154992a8dd5607abe49107bdf (patch) | |
| tree | ed8b039f4ce09e5d154c99f3fb934170c2a85bf3 /core/envsetup.mk | |
| parent | 376c686d7e798a5c6497d9a1ab7fb4f216f2664b (diff) | |
| parent | f6811abe12601c9753f329cb34da568f0072ca76 (diff) | |
| download | build-b4d757b1b2677ee154992a8dd5607abe49107bdf.zip build-b4d757b1b2677ee154992a8dd5607abe49107bdf.tar.gz build-b4d757b1b2677ee154992a8dd5607abe49107bdf.tar.bz2 | |
am f6811abe: am 9fbd3afd: am 431b4bb3: Merge "Extend the CPU ABI specification mechanism."
* commit 'f6811abe12601c9753f329cb34da568f0072ca76':
Extend the CPU ABI specification mechanism.
Diffstat (limited to 'core/envsetup.mk')
| -rw-r--r-- | core/envsetup.mk | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/core/envsetup.mk b/core/envsetup.mk index b2122e9..b46a7fa 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: |