android: fix build errors in Android S

Changelog:
- android_mips/android_mips64 variants do no exist anymore
- use -Wno-error=unreachable-code-loop-increment, required to compile
  llvm/lib/Target/AMDGPU/SIFormMemoryClauses.cpp

diff --git a/llvm/Android.bp b/llvm/Android.bp
index f106d6e..d38a1d3 100644 (file)
--- a/llvm/Android.bp
+++ b/llvm/Android.bp
@@ -39,6 +39,8 @@ llvm_defaults {
         // Temporarily suppress the warnings http://b/37867503
         "-Wno-error=unused-lambda-capture",
         "-Wno-error=user-defined-warnings",
+        // Avoid build error for llvm/lib/Target/AMDGPU/SIFormMemoryClauses.cpp (Android S)
+        "-Wno-error=unreachable-code-loop-increment",
     ],
 
     header_libs: ["llvm-headers-no-generated-headers"],
@@ -382,12 +384,6 @@ cc_library_shared {
                 llvm_arm_static_libraries +
                 llvm_aarch64_static_libraries,
         },
-        android_mips: {
-            whole_static_libs: llvm_mips_static_libraries,
-        },
-        android_mips64: {
-            whole_static_libs: llvm_mips_static_libraries,
-        },
         android_arm64: {
             whole_static_libs: llvm_aarch64_static_libraries +
                 llvm_arm_static_libraries,