diff options
| -rw-r--r-- | core/Makefile | 1 | ||||
| -rw-r--r-- | core/main.mk | 4 | ||||
| -rw-r--r-- | target/board/generic/BoardConfig.mk | 1 | ||||
| -rw-r--r-- | target/board/sim/BoardConfig.mk | 3 | ||||
| -rwxr-xr-x | tools/buildinfo.sh | 1 |
5 files changed, 10 insertions, 0 deletions
diff --git a/core/Makefile b/core/Makefile index fa0550c..110b3c9 100644 --- a/core/Makefile +++ b/core/Makefile @@ -131,6 +131,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="$(TARGET_CPU_ABI)" \ bash $(BUILDINFO_SH) > $@ $(hide) if [ -f $(TARGET_DEVICE_DIR)/system.prop ]; then \ cat $(TARGET_DEVICE_DIR)/system.prop >> $@; \ diff --git a/core/main.mk b/core/main.mk index 655a592..2bf8102 100644 --- a/core/main.mk +++ b/core/main.mk @@ -406,6 +406,10 @@ board_config_mk := # Clean up/verify variables defined by the board config file. TARGET_BOOTLOADER_BOARD_NAME := $(strip $(TARGET_BOOTLOADER_BOARD_NAME)) +TARGET_CPU_ABI := $(strip $(TARGET_CPU_ABI)) +ifeq ($(TARGET_CPU_ABI),) + $(error No TARGET_CPU_ABI defined by board config: $(board_config_mk)) +endif # # Include all of the makefiles in the system diff --git a/target/board/generic/BoardConfig.mk b/target/board/generic/BoardConfig.mk index a874742..6ec2de3 100644 --- a/target/board/generic/BoardConfig.mk +++ b/target/board/generic/BoardConfig.mk @@ -7,5 +7,6 @@ TARGET_NO_BOOTLOADER := true TARGET_NO_KERNEL := true TARGET_NO_RADIOIMAGE := true +TARGET_CPU_ABI := armeabi HAVE_HTC_AUDIO_DRIVER := true BOARD_USES_GENERIC_AUDIO := true diff --git a/target/board/sim/BoardConfig.mk b/target/board/sim/BoardConfig.mk index 92679d9..491b30f 100644 --- a/target/board/sim/BoardConfig.mk +++ b/target/board/sim/BoardConfig.mk @@ -17,6 +17,9 @@ TARGET_NO_BOOTLOADER := true # Don't bother with a kernel TARGET_NO_KERNEL := true +# The simulator does not support native code at all +TARGET_CPU_ABI := none + #the simulator partially emulates the original HTC /dev/eac audio interface HAVE_HTC_AUDIO_DRIVER := true BOARD_USES_GENERIC_AUDIO := true diff --git a/tools/buildinfo.sh b/tools/buildinfo.sh index 1fcac76..5c738a2 100755 --- a/tools/buildinfo.sh +++ b/tools/buildinfo.sh @@ -20,6 +20,7 @@ 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" +echo "ro.product.cpu.abi=$TARGET_CPU_ABI" echo "ro.product.manufacturer=$PRODUCT_MANUFACTURER" echo "ro.product.locale.language=$PRODUCT_DEFAULT_LANGUAGE" echo "ro.product.locale.region=$PRODUCT_DEFAULT_REGION" |