Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e0bcc4ef authored by Dan Albert's avatar Dan Albert Committed by android-build-merger
Browse files

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

am: a41288b8

* commit 'a41288b8':
  Don't apply clang flag to gcc builds.
parents ceb2b549 a41288b8

core/jni/Android.mk

+1 −1
Original line number Diff line number Diff line
@@ -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.