summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNicolas Geoffray <ngeoffray@google.com>2020-01-12 14:04:56 -0800
committerandroid-build-merger <android-build-merger@google.com>2020-01-12 14:04:56 -0800
commitdde21e2f40ed55ee312c89cdba97f63de9cd24a1 (patch)
tree25f41ee3169d699d3df9f0c8a456b3ee4fac0ad6
parenta671f0b2aa87a7ba442e57a24aa4ee0c6e26f3b9 (diff)
parentceb26b0a493d19bd99b1a2b642383ffc1bddfabe (diff)
downloaddevice_generic_art-dde21e2f40ed55ee312c89cdba97f63de9cd24a1.tar.gz
device_generic_art-dde21e2f40ed55ee312c89cdba97f63de9cd24a1.tar.bz2
device_generic_art-dde21e2f40ed55ee312c89cdba97f63de9cd24a1.zip
Merge "Revert "Make the mips64r6 config pretend it has a 2nd arch""
am: ceb26b0a49 Change-Id: I9ff582c1751657023fbc5ba2f248855da2c0c7ae
-rw-r--r--mips64r6/BoardConfig.mk7
1 files changed, 1 insertions, 6 deletions
diff --git a/mips64r6/BoardConfig.mk b/mips64r6/BoardConfig.mk
index d656e66..47eb1d8 100644
--- a/mips64r6/BoardConfig.mk
+++ b/mips64r6/BoardConfig.mk
@@ -20,16 +20,11 @@ TARGET_ARCH := mips64
TARGET_CPU_ABI := mips64
TARGET_CPU_SMP := true
-TARGET_CPU_VARIANT := mips64r6
+TARGET_CPU_VARIANT := generic
TARGET_ARCH_VARIANT := mips64r6
TARGET_PREFER_32_BIT_APPS :=
TARGET_SUPPORTS_32_BIT_APPS :=
TARGET_SUPPORTS_64_BIT_APPS := true
-TARGET_2ND_ARCH := mips
-TARGET_2ND_ARCH_VARIANT := mips32r2-fp
-TARGET_2ND_CPU_ABI := mips
-TARGET_2ND_CPU_VARIANT := mips32r2-fp
-
USE_CLANG_PLATFORM_BUILD := true