diff options
| author | Andreas Gampe <agampe@google.com> | 2015-07-10 21:46:17 -0700 |
|---|---|---|
| committer | Dan Albert <danalbert@google.com> | 2015-08-11 06:18:49 +0000 |
| commit | b08c24a3e4f5362bbddc3735802e844e1992cd46 (patch) | |
| tree | 693fe0dac13f6ee9071da4fd24da922f72d2e752 /core | |
| parent | c00b1067a05116548a0883e1400a1c4715078797 (diff) | |
| download | frameworks_base-b08c24a3e4f5362bbddc3735802e844e1992cd46.zip frameworks_base-b08c24a3e4f5362bbddc3735802e844e1992cd46.tar.gz frameworks_base-b08c24a3e4f5362bbddc3735802e844e1992cd46.tar.bz2 | |
Frameworks/base: Disable Clang in core/jni
thread_local does not work with Clang at the moment.
Bug: 22414716
Change-Id: I4059b63a1621c346bfc72dbbec0b9cb165485e26
(cherry picked from commit 2bc67a1b5f9d4662ef7da4645ca8e580302b3553)
Diffstat (limited to 'core')
| -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 5e5450e..6b07a47 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)) |