am b6f60d57: Use the lowest common denominator 32-bit abi for arm64 cts build.

* commit 'b6f60d57e3e5ccb89145cd2513a9a35077c025a5':
  Use the lowest common denominator 32-bit abi for arm64 cts build.
This commit is contained in:
Ying Wang
2014-10-23 00:14:19 +00:00
committed by Android Git Automerger

View File

@@ -25,13 +25,13 @@ TARGET_2ND_ARCH := arm
TARGET_2ND_CPU_ABI := armeabi-v7a TARGET_2ND_CPU_ABI := armeabi-v7a
TARGET_2ND_CPU_ABI2 := armeabi TARGET_2ND_CPU_ABI2 := armeabi
ifdef TARGET_BUILD_APPS ifneq ($(TARGET_BUILD_APPS)$(filter cts,$(MAKECMDGOALS)),)
# DO NOT USE # DO NOT USE
# DO NOT USE # DO NOT USE
# #
# This architecture / CPU variant must NOT be used for any 64 bit # This architecture / CPU variant must NOT be used for any 64 bit
# platform builds. It is the lowest common denominator required # 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. # platforms.
# #
# If you're building a 64 bit platform (and not an application) the # 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_CACHEIMAGE_FILE_SYSTEM_TYPE := ext4
BOARD_FLASH_BLOCK_SIZE := 512 BOARD_FLASH_BLOCK_SIZE := 512
TARGET_USERIMAGES_SPARSE_EXT_DISABLED := true TARGET_USERIMAGES_SPARSE_EXT_DISABLED := true