diff options
| author | Ying Wang <wangying@google.com> | 2014-10-21 21:20:41 -0700 |
|---|---|---|
| committer | The Android Automerger <android-build@google.com> | 2014-10-22 17:44:34 -0700 |
| commit | d462146cb60db849fb3c4c75cc9c857976dbf33d (patch) | |
| tree | 78339a01eebc617c6e3540f8bbef1d84497ea8e2 | |
| parent | a28925b917166c2c3d1bfbaf874117915412d5e3 (diff) | |
| download | build-d462146cb60db849fb3c4c75cc9c857976dbf33d.tar.gz | |
Use the lowest common denominator 32-bit abi for arm64 cts build.
So the 32-bit code can be run any supported 32-bit arm devices.
Bug: 18038310
Change-Id: Ie8864cfdb87a4759d1a775d43cb5316b1f022e2b
| -rw-r--r-- | target/board/generic_arm64/BoardConfig.mk | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/target/board/generic_arm64/BoardConfig.mk b/target/board/generic_arm64/BoardConfig.mk index c57447d143..818f857089 100644 --- a/target/board/generic_arm64/BoardConfig.mk +++ b/target/board/generic_arm64/BoardConfig.mk @@ -25,13 +25,13 @@ TARGET_2ND_ARCH := arm TARGET_2ND_CPU_ABI := armeabi-v7a TARGET_2ND_CPU_ABI2 := armeabi -ifdef TARGET_BUILD_APPS +ifneq ($(TARGET_BUILD_APPS)$(filter cts,$(MAKECMDGOALS)),) # DO NOT USE # DO NOT USE # # This architecture / CPU variant must NOT be used for any 64 bit # platform builds. It is the lowest common denominator required -# to build an unbundled application for all supported 32 and 64 bit +# to build an unbundled application or cts for all supported 32 and 64 bit # platforms. # # If you're building a 64 bit platform (and not an application) the @@ -82,4 +82,3 @@ BOARD_CACHEIMAGE_PARTITION_SIZE := 69206016 BOARD_CACHEIMAGE_FILE_SYSTEM_TYPE := ext4 BOARD_FLASH_BLOCK_SIZE := 512 TARGET_USERIMAGES_SPARSE_EXT_DISABLED := true - |