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

Commit 0eadf57c authored by Dan Albert's avatar Dan Albert
Browse files

Don't apply clang flag to gcc builds. 

For whatever reason GCC doesn't fail the build on unknown flags unless
there is also a warning emitted. Since we're now deprecating
UniquePtr, the warning is thrown here and the build fails (despite not
being -Werror).

Bug: http://b/22403888
Change-Id: I4af7911a51f7af9aa47a596a76f3e9d79535585b
parent 82eeb2f2

core/jni/Android.mk

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

# -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.

#                        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

# b/22414716: thread_local (android/graphics/Paint.cpp) and Clang don't like each other at the

#             moment.

#             moment.