diff options
| author | Narayan Kamath <narayan@google.com> | 2014-04-07 11:01:54 +0100 |
|---|---|---|
| committer | Narayan Kamath <narayan@google.com> | 2014-04-08 17:40:40 +0100 |
| commit | 7303ebda84f64a2823f76282e8e1d6886da08cf0 (patch) | |
| tree | 6b0fe6264ae5999b00264908a5339f8f4346ebcd /core/envsetup.mk | |
| parent | 260942fa826052f24455dbaf74e54189efb44e8b (diff) | |
| download | build-7303ebda84f64a2823f76282e8e1d6886da08cf0.zip build-7303ebda84f64a2823f76282e8e1d6886da08cf0.tar.gz build-7303ebda84f64a2823f76282e8e1d6886da08cf0.tar.bz2 | |
Add 32 / 64 bit abi lists to system properties.
Introduce ro.product.cpu.abilist32 / abilist64, which are
comma separated lists of the 32 and 64 bit ABIs that the
device supports. These properties are used by the zygote and
system server to determine what ABI an app should be
started with.
This changes move abilist related make steps out of envsetup.mk
and into config.mk because they depend on variables set by
core/combo/***. Additionally, config.mk performs a few additional
cleanups of these variables (like stripping them) after the
inclusion of envsetup.mk so this seems like a better place to
put them.
bug: 13647418
Change-Id: I3db39bdd761220c5b4966f651892fb592396f9a1
Diffstat (limited to 'core/envsetup.mk')
| -rw-r--r-- | core/envsetup.mk | 22 |
1 files changed, 0 insertions, 22 deletions
diff --git a/core/envsetup.mk b/core/envsetup.mk index 628c95b..4cb389b 100644 --- a/core/envsetup.mk +++ b/core/envsetup.mk @@ -143,28 +143,6 @@ 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: |