summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn Reck <jreck@google.com>2015-06-08 18:08:20 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-06-08 18:08:33 +0000
commit5b688e848c05d8ce0903348b3644184df3d5711a (patch)
tree3ceb525605fdd5e107cf37249bb09203fe6a6c81
parent3bd053f9780424b0a293881966fd38b226f4b923 (diff)
parente6178208c2190728ac0711904404a237ab21fc51 (diff)
downloadframeworks_base-5b688e848c05d8ce0903348b3644184df3d5711a.zip
frameworks_base-5b688e848c05d8ce0903348b3644184df3d5711a.tar.gz
frameworks_base-5b688e848c05d8ce0903348b3644184df3d5711a.tar.bz2
Merge "Disable -Werror on Clang" into mnc-dev
-rw-r--r--libs/hwui/Android.common.mk6
1 files changed, 5 insertions, 1 deletions
diff --git a/libs/hwui/Android.common.mk b/libs/hwui/Android.common.mk
index a5bfde7..9590595 100644
--- a/libs/hwui/Android.common.mk
+++ b/libs/hwui/Android.common.mk
@@ -118,5 +118,9 @@ endif
# Defaults for ATRACE_TAG and LOG_TAG for libhwui
LOCAL_CFLAGS += -DATRACE_TAG=ATRACE_TAG_VIEW -DLOG_TAG=\"OpenGLRenderer\"
+LOCAL_CFLAGS += -Wall -Wno-unused-parameter -Wunreachable-code
-LOCAL_CFLAGS += -Wall -Werror -Wno-unused-parameter -Wunreachable-code
+# b/21698669
+ifneq ($(USE_CLANG_PLATFORM_BUILD),true)
+ LOCAL_CFLAGS += -Werror
+endif