diff options
| author | Andreas Gampe <agampe@google.com> | 2015-08-11 06:35:42 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-11 06:35:42 +0000 |
| commit | d06696939b922a7849c90e5421e2100340a8e913 (patch) | |
| tree | 267e3edc24d1d8955f19ac450c6de98eb911ab5c | |
| parent | bc58c9453fd4f647a3382608f8de8e557854758d (diff) | |
| parent | b08c24a3e4f5362bbddc3735802e844e1992cd46 (diff) | |
| download | frameworks_base-d06696939b922a7849c90e5421e2100340a8e913.zip frameworks_base-d06696939b922a7849c90e5421e2100340a8e913.tar.gz frameworks_base-d06696939b922a7849c90e5421e2100340a8e913.tar.bz2 | |
am b08c24a3: Frameworks/base: Disable Clang in core/jni
* commit 'b08c24a3e4f5362bbddc3735802e844e1992cd46':
Frameworks/base: Disable Clang in core/jni
| -rw-r--r-- | core/jni/Android.mk | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/core/jni/Android.mk b/core/jni/Android.mk index 2af92c7..fc15b964 100644 --- a/core/jni/Android.mk +++ b/core/jni/Android.mk @@ -273,6 +273,10 @@ LOCAL_CFLAGS += -Wall -Werror -Wno-error=deprecated-declarations -Wunused -Wunre # is not being compiled with that level. Remove once this has changed. LOCAL_CFLAGS += -Wno-c++11-extensions +# b/22414716: thread_local (android/graphics/Paint.cpp) and Clang don't like each other at the +# moment. +LOCAL_CLANG := false + include $(BUILD_SHARED_LIBRARY) include $(call all-makefiles-under,$(LOCAL_PATH)) |