Merge "Fix Soong mips builds"

1307831b · Dan Willemsen · Gerrit Code Review · 2576ce94 · e4f486ca · 1307831b
Commit 1307831b authored 9 years ago by Dan Willemsen Committed by Gerrit Code Review 9 years ago
Hide whitespace changes
Inline Side-by-side

Showing with 9 additions and 2 deletions

libc/Android.bp libc/Android.bp +9 -2

No files found.
--- a/libc/Android.bp
+++ b/libc/Android.bp
@@ -113,12 +113,19 @@ cc_defaults {
            cflags: ["-DUSE_DLMALLOC"],
        },
    },
-    // Clang/llvm has incompatible long double (fp128) for x86_64.
-    // https://llvm.org/bugs/show_bug.cgi?id=23897
    arch: {
+        // Clang/llvm has incompatible long double (fp128) for x86_64.
+        // https://llvm.org/bugs/show_bug.cgi?id=23897
        x86_64: {
            clang: false,
        },
+        // b/25291096, Clang/llvm compiled libc.so for mips/mips64 failed to boot.
+        mips: {
+            clang: false,
+        },
+        mips64: {
+            clang: false,
+        },
    },

    stl: "none",