diff options
| author | 2015-07-10 21:46:17 -0700 | |
|---|---|---|
| committer | 2015-07-10 21:46:17 -0700 | |
| commit | 2bc67a1b5f9d4662ef7da4645ca8e580302b3553 (patch) | |
| tree | 71a345093d14741d0ae30265632dae571625690f | |
| parent | 3c23a7af473afc723457b27bcd38339b954aa207 (diff) | |
Frameworks/base: Disable Clang in core/jni
thread_local does not work with Clang at the moment.
Bug: 22414716
Change-Id: I4059b63a1621c346bfc72dbbec0b9cb165485e26
| -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 5e5450e95371..6b07a47298d1 100644 --- a/core/jni/Android.mk +++ b/core/jni/Android.mk @@ -269,6 +269,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)) |