summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Willemsen <dwillemsen@google.com>2016-05-10 15:03:13 -0700
committerDan Willemsen <dwillemsen@google.com>2016-05-10 15:03:13 -0700
commitfb3fa9fc21f200a77cd4b4d1df01302ade359d1c (patch)
tree16b9ec94046bc1d2372554bf9ee3bf8544cd6759
parent138339be1da9b0f34befe3751b0bae874d7253db (diff)
downloadx86_64-fb3fa9fc21f200a77cd4b4d1df01302ade359d1c.tar.gz
The current 32-bit configuration for generic x86_64 targets inherits some variables (SSE4 support) from the 64-bit configuration, and overrides the make variables used for other configurations (SSSE3). Ideally, these would be using different variables, but until then, unify the configuration for x86_64 targets so that everything is consistent. Bug: 28694691 Change-Id: I28efa1834f58dd2a771796c58f536d249ccf2d91
-rw-r--r--BoardConfig.mk5
1 files changed, 2 insertions, 3 deletions
diff --git a/BoardConfig.mk b/BoardConfig.mk
index 9ade5ac..924e523 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -9,11 +9,10 @@ TARGET_NO_KERNEL := true
TARGET_CPU_ABI := x86_64
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_2ND_ARCH_VARIANT := x86_64
TARGET_USES_64_BIT_BINDER := true
@@ -36,4 +35,4 @@ BOARD_USERDATAIMAGE_PARTITION_SIZE := 576716800
BOARD_CACHEIMAGE_PARTITION_SIZE := 69206016
BOARD_CACHEIMAGE_FILE_SYSTEM_TYPE := ext4
BOARD_FLASH_BLOCK_SIZE := 512
-TARGET_USERIMAGES_SPARSE_EXT_DISABLED := true \ No newline at end of file
+TARGET_USERIMAGES_SPARSE_EXT_DISABLED := true