OSDN Git Service
(root)
/
android-x86
/
frameworks-base.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(from parent 1:
c00b106
)
Frameworks/base: Disable Clang in core/jni
author
Andreas Gampe
<agampe@google.com>
Sat, 11 Jul 2015 04:46:17 +0000
(21:46 -0700)
committer
Dan Albert
<danalbert@google.com>
Tue, 11 Aug 2015 06:18:49 +0000
(06:18 +0000)
thread_local does not work with Clang at the moment.
Bug:
22414716
Change-Id: I4059b63a1621c346bfc72dbbec0b9cb165485e26
(cherry picked from commit
2bc67a1b5f9d4662ef7da4645ca8e580302b3553
)
core/jni/Android.mk
patch
|
blob
|
history
diff --git
a/core/jni/Android.mk
b/core/jni/Android.mk
index
5e5450e
..
6b07a47
100644
(file)
--- 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))