commit b693817f5d0ea2a961f1abd26fa45e186a493c7b
author Ben Wagner <bungeman@google.com> Thu Mar 17 17:31:40 2016 -0400
committer Ben Wagner <bungeman@google.com> Fri Mar 18 00:25:38 2016 +0000
tree 270f818b13640b6e64e0a52702b3aea5a9aca76c
parent 4c2fd7afb06f248f3e0e1bdcfa5fc1269b573eb7

Switch frameworks/base/core/jni from gcc to clang.

Bug: http://b/22414716

Change-Id: If77628daf4e621008cda96645a9fffbf0fba4992

core/jni/Android.mk

diff --git a/core/jni/Android.mk b/core/jni/Android.mk
index 37204988..9e58944 100644
--- a/core/jni/Android.mk
+++ b/core/jni/Android.mk
@@ -279,10 +279,6 @@
 #                        is not being compiled with that level. Remove once this has changed.
 LOCAL_CLANG_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))