drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
am: a41288b88f

* commit 'a41288b88f18273a61ed0af977408761598216cf':
  Don't apply clang flag to gcc builds.
This commit is contained in:
Dan Albert
2015-11-05 18:28:19 +00:00
committed by android-build-merger
parent ceb2b54909 a41288b88f
commit e0bcc4efe9
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/jni/Android.mk
View File

@ -273,7 +273,7 @@ LOCAL_CFLAGS += -Wall -Werror -Wno-error=deprecated-declarations -Wunused -Wunre
# -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.