From e6178208c2190728ac0711904404a237ab21fc51 Mon Sep 17 00:00:00 2001
From: John Reck <jreck@google.com>
Date: Mon, 8 Jun 2015 11:01:24 -0700
Subject: [PATCH] Disable -Werror on Clang

Bug: 21698669
Change-Id: I90549599ed52cff028a29f56d3d8ffe80c9afab4
---
 libs/hwui/Android.common.mk | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/libs/hwui/Android.common.mk b/libs/hwui/Android.common.mk
index a5bfde736334c..95905956fb786 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