diff options
| author | 2015-08-11 06:49:27 +0000 | |
|---|---|---|
| committer | 2015-08-11 06:49:27 +0000 | |
| commit | 1be6e1c7643859839157534d45677fa20169fd1d (patch) | |
| tree | 9d025f5c915f9537efbb3dd632d1b15edb10cb18 | |
| parent | bfa04f4998956e510a935f6514298dcd3d122264 (diff) | |
| parent | 9502cc548b0000bc192fcf597596e109f3d93f02 (diff) | |
am 9502cc54: am d0669693: am b08c24a3: Frameworks/base: Disable Clang in core/jni
* commit '9502cc548b0000bc192fcf597596e109f3d93f02':
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 2af92c7afbb9..fc15b964826e 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)) |