Merge \"Fix Mega_device build\"

am: e36d753ed1 Change-Id: Ie675bfbaa7e1610bf669f65a8cdc7da41666d91f
2016-07-20 20:32:23 +00:00
parent 08b4411d5b e36d753ed1
commit 335a5128cb
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'