Merge "Fix compiler warnings to enable -Werror."
diff --git a/chromium/plat_support/draw_gl_functor.cpp b/chromium/plat_support/draw_gl_functor.cpp
index 25f4877..7cb49da 100644
--- a/chromium/plat_support/draw_gl_functor.cpp
+++ b/chromium/plat_support/draw_gl_functor.cpp
@@ -31,7 +31,8 @@
 #include <utils/Log.h>
 
 #define NELEM(x) ((int) (sizeof(x) / sizeof((x)[0])))
-#define COMPILE_ASSERT(expr, err) static const char (err)[(expr) ? 1 : -1] = "";
+#define COMPILE_ASSERT(expr, err) \
+__unused static const char (err)[(expr) ? 1 : -1] = "";
 
 namespace android {
 namespace {