summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn Reck <jreck@google.com>2015-11-04 16:24:02 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-11-04 16:24:02 +0000
commit1e1fbd804b71419736eac4bf537f0a454687b209 (patch)
tree8d2ab338ffdf3654415ded1fa83329d38b5b46fe
parent4c9cdbc7ba72d6dc09e0f2bacbf8641c764045ca (diff)
parent492a56cc93fef4c844fc2ce429fb8f4fbfef7674 (diff)
downloadframeworks_base-1e1fbd804b71419736eac4bf537f0a454687b209.zip
frameworks_base-1e1fbd804b71419736eac4bf537f0a454687b209.tar.gz
frameworks_base-1e1fbd804b71419736eac4bf537f0a454687b209.tar.bz2
Merge "Revert "Use clang for libhwui"" into mnc-dr-dev
-rw-r--r--libs/hwui/Android.common.mk3
1 files changed, 0 insertions, 3 deletions
diff --git a/libs/hwui/Android.common.mk b/libs/hwui/Android.common.mk
index c80f2cf..38e8be9 100644
--- a/libs/hwui/Android.common.mk
+++ b/libs/hwui/Android.common.mk
@@ -1,9 +1,6 @@
# getConfig in external/skia/include/core/SkBitmap.h is deprecated.
# Allow Gnu extension: in-class initializer of static 'const float' member.
# DeferredLayerUpdater.h: private field 'mRenderThread' is not used.
-
-LOCAL_CLANG := true
-
LOCAL_CLANG_CFLAGS += \
-Wno-deprecated-declarations \
-Wno-gnu-static-float-init \