diff options
| author | Andreas Gampe <agampe@google.com> | 2014-11-11 02:38:03 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-11-11 02:38:08 +0000 |
| commit | c6e992a1bc1bc02be9770ad2c384b6b7e5a0db0b (patch) | |
| tree | a3b60384cabb48f694e3c68649dab19e302c4577 | |
| parent | 1d03b816fea1b964cc5db4d11ddcba9b25f45d99 (diff) | |
| parent | 6b83b76dd18e2a727936839b397e6ed2ed4f5a46 (diff) | |
| download | frameworks_base-c6e992a1bc1bc02be9770ad2c384b6b7e5a0db0b.zip frameworks_base-c6e992a1bc1bc02be9770ad2c384b6b7e5a0db0b.tar.gz frameworks_base-c6e992a1bc1bc02be9770ad2c384b6b7e5a0db0b.tar.bz2 | |
Merge "Frameworks/base: Wall Werror in libs/input"
| -rw-r--r-- | libs/input/Android.mk | 6 | ||||
| -rw-r--r-- | libs/input/PointerController.cpp | 3 | ||||
| -rw-r--r-- | 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 a7fb0e2..2bbfdcc 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 9af521b..1152737 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 5391393..0bc832a 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 { |