From 4fbdc9fb12e515aad41adb08692c6bdbf5999bf9 Mon Sep 17 00:00:00 2001
From: James Zern <jzern@google.com>
Date: Thu, 31 Aug 2017 22:42:14 -0700
Subject: [PATCH] Android.mk,mips: fix clang build with r15

-integrated-as is now required, the opposite of r14

Change-Id: Ic478b2b3b933e66e7d159030eac29f58743eecda
---
 Android.mk | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/Android.mk b/Android.mk
index f15823e1..872e66bc 100644
--- a/Android.mk
+++ b/Android.mk
@@ -15,7 +15,10 @@ endif
 # https://bugs.chromium.org/p/webp/issues/detail?id=343
 ifeq ($(findstring clang,$(NDK_TOOLCHAIN_VERSION)),clang)
   ifeq ($(TARGET_ARCH),mips)
-    WEBP_CFLAGS += -no-integrated-as
+    clang_version := $(shell $(TARGET_CC) --version)
+    ifneq ($(findstring clang version 3,$(clang_version)),)
+      WEBP_CFLAGS += -no-integrated-as
+    endif
   endif
 endif