Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am c6e992a1: Merge "Frameworks/base: Wall Werror in libs/input"

Browse Source 
* commit 'c6e992a1bc1bc02be9770ad2c384b6b7e5a0db0b':
  Frameworks/base: Wall Werror in libs/input
This commit is contained in:
Andreas Gampe
2014-11-11 04:56:54 +00:00
committed by Android Git Automerger
parent 1272887050 c6e992a1bc
commit 6ca82929b1
3 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
libs/input/Android.mk
View File

@@ -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

3
libs/input/PointerController.cpp
View File

@@ -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 {

4
libs/input/SpriteController.cpp
View File

@@ -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 {