commit d9a1b35df62eddc56f69281aea1534d187b63205
author Dan Albert <danalbert@google.com> Thu Nov 05 18:18:45 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Nov 05 18:18:45 2015 +0000
tree 8bd9a6bf3a9e9a7cb37a8a7fb937ab139923ed61
parent 82eeb2f20c934ddc97380032b3c8ecacc21d9a04
parent 0eadf57cadf2f39db1923c25767e4a00e7f00135

Merge "Don't apply clang flag to gcc builds."

core/jni/Android.mk

diff --git a/core/jni/Android.mk b/core/jni/Android.mk
index 47b2f3b..4c68e01 100644
--- a/core/jni/Android.mk
+++ b/core/jni/Android.mk
@@ -273,7 +273,7 @@
 
 # -Wno-c++11-extensions: Clang warns about Skia using the C++11 override keyword, but this project
 #                        is not being compiled with that level. Remove once this has changed.
-LOCAL_CFLAGS += -Wno-c++11-extensions
+LOCAL_CLANG_CFLAGS += -Wno-c++11-extensions
 
 # b/22414716: thread_local (android/graphics/Paint.cpp) and Clang don't like each other at the
 #             moment.