diff options
| author | Colin Cross <ccross@android.com> | 2014-03-07 19:33:07 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-07 19:33:07 +0000 |
| commit | 8743fc32dfdeb2b64541a81ff4099ce7e4c0f857 (patch) | |
| tree | 92fbb2af002e86dc6d1639a8eab1b0af9efbb6d5 | |
| parent | 16ae8b4dd1c7dadb1d0d7437181e118b670095b2 (diff) | |
| parent | f10efbc15e458f50bb29fe9ad0653fb2e08fd8fb (diff) | |
| download | build-8743fc32dfdeb2b64541a81ff4099ce7e4c0f857.zip build-8743fc32dfdeb2b64541a81ff4099ce7e4c0f857.tar.gz build-8743fc32dfdeb2b64541a81ff4099ce7e4c0f857.tar.bz2 | |
am f10efbc1: Merge "make 64-bit builds into multiarch builds"
* commit 'f10efbc15e458f50bb29fe9ad0653fb2e08fd8fb':
make 64-bit builds into multiarch builds
| -rw-r--r-- | target/board/generic_arm64/BoardConfig.mk | 8 | ||||
| -rw-r--r-- | target/board/generic_mips64/BoardConfig.mk | 6 | ||||
| -rwxr-xr-x | target/board/generic_x86_64/BoardConfig.mk | 6 | ||||
| -rw-r--r-- | target/product/aosp_arm64.mk | 2 | ||||
| -rw-r--r-- | target/product/full_mips64.mk | 2 | ||||
| -rwxr-xr-x | target/product/full_x86_64.mk | 2 |
6 files changed, 26 insertions, 0 deletions
diff --git a/target/board/generic_arm64/BoardConfig.mk b/target/board/generic_arm64/BoardConfig.mk index 03284d7..72b21e6 100644 --- a/target/board/generic_arm64/BoardConfig.mk +++ b/target/board/generic_arm64/BoardConfig.mk @@ -21,6 +21,14 @@ TARGET_ARCH_VARIANT := armv8-a TARGET_CPU_VARIANT := generic TARGET_CPU_ABI := arm64-v8a +TARGET_2ND_ARCH := arm +TARGET_2ND_ARCH_VARIANT := armv7-a-neon +TARGET_2ND_CPU_VARIANT := generic +TARGET_2ND_CPU_ABI := armeabi-v7a +TARGET_2ND_CPU_ABI2 := armeabi + +TARGET_USES_64_BIT_BINDER := true + # no hardware camera USE_CAMERA_STUB := true diff --git a/target/board/generic_mips64/BoardConfig.mk b/target/board/generic_mips64/BoardConfig.mk index 26e4d69..1f465ae 100644 --- a/target/board/generic_mips64/BoardConfig.mk +++ b/target/board/generic_mips64/BoardConfig.mk @@ -28,6 +28,12 @@ TARGET_ARCH_VARIANT := mips64r2 endif TARGET_CPU_ABI := mips64 +TARGET_2ND_ARCH := mips +ifeq (,$(TARGET_2ND_ARCH_VARIANT)) +TARGET_2ND_ARCH_VARIANT := mips32r2-fp +endif +TARGET_CPU_ABI := mips + # The emulator (qemu) uses the Goldfish devices HAVE_HTC_AUDIO_DRIVER := true BOARD_USES_GENERIC_AUDIO := true diff --git a/target/board/generic_x86_64/BoardConfig.mk b/target/board/generic_x86_64/BoardConfig.mk index 8a2fd13..5e808e2 100755 --- a/target/board/generic_x86_64/BoardConfig.mk +++ b/target/board/generic_x86_64/BoardConfig.mk @@ -11,6 +11,12 @@ TARGET_ARCH := x86_64 TARGET_ARCH_VARIANT := x86_64 TARGET_PRELINK_MODULE := false +TARGET_2ND_CPU_ABI := x86 +TARGET_2ND_ARCH := x86 +TARGET_2ND_ARCH_VARIANT := x86 + +TARGET_USES_64_BIT_BINDER := true + # The IA emulator (qemu) uses the Goldfish devices HAVE_HTC_AUDIO_DRIVER := true BOARD_USES_GENERIC_AUDIO := true diff --git a/target/product/aosp_arm64.mk b/target/product/aosp_arm64.mk index 7f97a61..8ff0bd1 100644 --- a/target/product/aosp_arm64.mk +++ b/target/product/aosp_arm64.mk @@ -22,6 +22,8 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_base_telephony.mk) $(call inherit-product, $(SRC_TARGET_DIR)/board/generic_arm64/device.mk) +PRODUCT_RUNTIMES := runtime_libart_default + include $(SRC_TARGET_DIR)/product/emulator.mk PRODUCT_NAME := aosp_arm64 PRODUCT_DEVICE := generic_arm64 diff --git a/target/product/full_mips64.mk b/target/product/full_mips64.mk index d0214b8..3f171e0 100644 --- a/target/product/full_mips64.mk +++ b/target/product/full_mips64.mk @@ -22,6 +22,8 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_base_telephony.mk) $(call inherit-product, $(SRC_TARGET_DIR)/board/generic_mips64/device.mk) +PRODUCT_RUNTIMES := runtime_libart_default + include $(SRC_TARGET_DIR)/product/emulator.mk # Overrides diff --git a/target/product/full_x86_64.mk b/target/product/full_x86_64.mk index 644f2a2..8b964c2 100755 --- a/target/product/full_x86_64.mk +++ b/target/product/full_x86_64.mk @@ -26,6 +26,8 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_base_telephony.mk) $(call inherit-product, $(SRC_TARGET_DIR)/board/generic_x86_64/device.mk) +PRODUCT_RUNTIMES := runtime_libart_default + include $(SRC_TARGET_DIR)/product/emulator.mk ifdef NET_ETH0_STARTONBOOT |