commit a41288b88f18273a61ed0af977408761598216cf
author Dan Albert <danalbert@google.com> Thu Nov 05 18:22:57 2015 +0000
committer android-build-merger <android-build-merger@google.com> Thu Nov 05 18:22:57 2015 +0000
tree 4e94c077a6ef20df17d90d76174665c6b5b0f44e
parent 0c7e9262a1cc89b748e281f330dd1ffecec6df3f
parent d9a1b35df62eddc56f69281aea1534d187b63205

Merge "Don\'t apply clang flag to gcc builds."
am: d9a1b35df6

* commit 'd9a1b35df62eddc56f69281aea1534d187b63205':
  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.