Merge "Android.mk,mips: fix clang build with r15"

2017-09-01 06:32:06 +00:00 · 2017-09-01 06:32:06 +00:00 · 4a9d788e40
commit 4a9d788e40
parent a80fcc4ae1 4fbdc9fb12
1 changed files with 4 additions and 1 deletions
--- a/Android.mk
+++ b/Android.mk
@ -15,8 +15,11 @@ endif
 # https://bugs.chromium.org/p/webp/issues/detail?id=343
 ifeq ($(findstring clang,$(NDK_TOOLCHAIN_VERSION)),clang)
  ifeq ($(TARGET_ARCH),mips)
+    clang_version := $(shell $(TARGET_CC) --version)
+    ifneq ($(findstring clang version 3,$(clang_version)),)
      WEBP_CFLAGS += -no-integrated-as
    endif
+  endif
 endif

 ifneq ($(findstring armeabi-v7a, $(TARGET_ARCH_ABI)),)