commit ceb26b0a493d19bd99b1a2b642383ffc1bddfabe
author Nicolas Geoffray <ngeoffray@google.com> Mon Sep 12 08:33:49 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Sep 12 08:33:49 2016 +0000
tree 25f41ee3169d699d3df9f0c8a456b3ee4fac0ad6
parent 19f426df221d573fbb4cf890d862cf3275a7d01b
parent b4042ae00d629a713414ba75af3351ed4cc3702e

Merge "Revert "Make the mips64r6 config pretend it has a 2nd arch""

mips64r6/BoardConfig.mk

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_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