commit 466bb2789a9f0c0e7ccc64d72a2866626c1f433f
author Greg Hartman <ghartman@google.com> Fri Mar 16 22:46:21 2018 -0700
committer Nicolas Capens <nicolascapens@google.com> Tue Apr 10 13:21:39 2018 +0000
tree c5aafb6fee353d3cd468eb70e1afec62d19e74d1
parent f7a3ff04355a9487d7f09151c0a9163a1859a0a4

Add -Wno-sentinel that is needed on Android K

Bug b/75229322
Test: Local build of K
Fixes build break ab/4660759
Change-Id: Ib2cb43594b331c4415650517df65e8ccd497f820
Reviewed-on: https://swiftshader-review.googlesource.com/18190
Tested-by: Nicolas Capens <nicolascapens@google.com>
Reviewed-by: Nicolas Capens <nicolascapens@google.com>

third_party/LLVM/Android.mk

diff --git a/third_party/LLVM/Android.mk b/third_party/LLVM/Android.mk
index 069645d..a07ca23 100644
--- a/third_party/LLVM/Android.mk
+++ b/third_party/LLVM/Android.mk
@@ -418,6 +418,11 @@
 LOCAL_CFLAGS += -D__STDC_INT64__
 endif
 
+ifeq (19,${PLATFORM_SDK_VERSION})
+# The compiler that shipped with K had false positives for missing sentinels
+LOCAL_CFLAGS += -Wno-sentinel
+endif
+
 LOCAL_CFLAGS += -fomit-frame-pointer -Os -ffunction-sections -fdata-sections
 LOCAL_CFLAGS += -fno-operator-names -msse2 -D__STDC_CONSTANT_MACROS -D__STDC_LIMIT_MACROS
 LOCAL_CFLAGS += -std=c++11