diff options
| author | Ying Wang <wangying@google.com> | 2014-10-23 19:46:53 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-10-23 19:46:53 +0000 |
| commit | 9e4f5326b040df63d1935bdf8b2deda0152445eb (patch) | |
| tree | eb1f80fe5f945270f2eff715887037faf0f1ddb2 /target/board/generic_arm64 | |
| parent | cac6acc9a70e815b6e54fbaa71b64c43058ec892 (diff) | |
| parent | 9318a22f96dd1d4ffcae76fb20520a303ef10fdf (diff) | |
| download | build-9e4f5326b040df63d1935bdf8b2deda0152445eb.zip build-9e4f5326b040df63d1935bdf8b2deda0152445eb.tar.gz build-9e4f5326b040df63d1935bdf8b2deda0152445eb.tar.bz2 | |
am 9318a22f: am b6f60d57: Use the lowest common denominator 32-bit abi for arm64 cts build.
* commit '9318a22f96dd1d4ffcae76fb20520a303ef10fdf':
Use the lowest common denominator 32-bit abi for arm64 cts build.
Diffstat (limited to 'target/board/generic_arm64')
| -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 c57447d..818f857 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 - |