Merge \\"Fix Mega_device build\\" am: e36d753ed1

am: 335a5128cb Change-Id: I426447e098feee037f8ba81ea57bf87f04bb5a10
2016-07-20 20:34:51 +00:00
parent 8e5ce9f1b8 335a5128cb
commit 28ca802d39
1 changed files with 1 additions and 1 deletions
--- a/android/arch.go
+++ b/android/arch.go
@@ -814,7 +814,7 @@ func decodeMegaDevice() ([]Target, error) {
 		{"mips", "mips32-fp", "", []string{"mips"}},
 		{"mips", "mips32r2-fp", "", []string{"mips"}},
 		{"mips", "mips32r2-fp-xburst", "", []string{"mips"}},
-		{"mips", "mips32r6", "", []string{"mips"}},
+		//{"mips", "mips32r6", "", []string{"mips"}},
 		// mips32r2dsp[r2]-fp fails in the assembler for divdf3.c in compiler-rt:
 		// (same errors in make and soong)
 		//   Error: invalid operands `mtlo $ac0,$11'