From 6b83b76dd18e2a727936839b397e6ed2ed4f5a46 Mon Sep 17 00:00:00 2001
From: Andreas Gampe <agampe@google.com>
Date: Mon, 10 Nov 2014 15:55:11 -0800
Subject: [PATCH] Frameworks/base: Wall Werror in libs/input

Enable -Wall -Werror in libs/input. Mask warnings from Skia.

Change-Id: I0deeffde07fcf3a09eadec2852e9bf5666b55ee8
---
 libs/input/Android.mk            | 6 +++---
 libs/input/PointerController.cpp | 3 +++
 libs/input/SpriteController.cpp  | 4 ++++
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/libs/input/Android.mk b/libs/input/Android.mk
index a7fb0e2124898..2bbfdcc8a816c 100644
--- a/libs/input/Android.mk
+++ b/libs/input/Android.mk
@@ -27,14 +27,14 @@ LOCAL_SHARED_LIBRARIES := \
     libskia \
     libgui \
     libui \
-	libinput \
-	libinputflinger
+    libinput \
+    libinputflinger
 
 LOCAL_C_INCLUDES := \
     frameworks/native/services
 
 
-LOCAL_CFLAGS += -Wno-unused-parameter
+LOCAL_CFLAGS += -Wall -Werror -Wunused -Wunreachable-code
 
 LOCAL_MODULE:= libinputservice
 
diff --git a/libs/input/PointerController.cpp b/libs/input/PointerController.cpp
index 9af521b7aba22..11527378f586e 100644
--- a/libs/input/PointerController.cpp
+++ b/libs/input/PointerController.cpp
@@ -25,11 +25,14 @@
 
 #include <cutils/log.h>
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wunused-parameter"
 #include <SkBitmap.h>
 #include <SkCanvas.h>
 #include <SkColor.h>
 #include <SkPaint.h>
 #include <SkXfermode.h>
+#pragma GCC diagnostic pop
 
 namespace android {
 
diff --git a/libs/input/SpriteController.cpp b/libs/input/SpriteController.cpp
index 5391393391974..0bc832a8fb37e 100644
--- a/libs/input/SpriteController.cpp
+++ b/libs/input/SpriteController.cpp
@@ -24,11 +24,15 @@
 #include <utils/String8.h>
 #include <gui/Surface.h>
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wunused-parameter"
 #include <SkBitmap.h>
 #include <SkCanvas.h>
 #include <SkColor.h>
 #include <SkPaint.h>
 #include <SkXfermode.h>
+#pragma GCC diagnostic pop
+
 #include <android/native_window.h>
 
 namespace android {