diff options
| author | Narayan Kamath <narayan@google.com> | 2014-03-31 12:09:51 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-03-31 12:09:51 +0000 |
| commit | 431b4bb354699704e5e601483095efed93bd908c (patch) | |
| tree | bf7ff8a7f511e46e4c9f6a557c483c5d1237d690 | |
| parent | 1da02a1ae15afc7b600f9585cc4ae52c5d262192 (diff) | |
| parent | 1a43b375b463c5b2bdac7d4038ea57d83fc2ae0c (diff) | |
| download | build-431b4bb354699704e5e601483095efed93bd908c.tar.gz | |
Merge "Extend the CPU ABI specification mechanism."
| -rw-r--r-- | core/Makefile | 1 | ||||
| -rw-r--r-- | core/envsetup.mk | 22 | ||||
| -rwxr-xr-x | tools/buildinfo.sh | 7 |
3 files changed, 30 insertions, 0 deletions
diff --git a/core/Makefile b/core/Makefile index 1a008d8057..918a94f214 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 4cb389bf4e..628c95b262 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: diff --git a/tools/buildinfo.sh b/tools/buildinfo.sh index e3fe99c111..39ddc668c1 100755 --- a/tools/buildinfo.sh +++ b/tools/buildinfo.sh @@ -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" |