summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Chih-hung Hsieh <chh@google.com> 2017-11-07 21:57:44 +0000
committer android-build-merger <android-build-merger@google.com> 2017-11-07 21:57:44 +0000
commite36e7be0fe446320fe86b0825f902439fdd1bda7 (patch)
tree38b9432c9c767d0f2615223f9e153a3b1df7e6b1
parenta7be518c1135a7ab5e4e613dba233caae89e950a (diff)
parent0c328734f56d716794f31527b5fd96871f5f88c2 (diff)
Merge "Use -Werror in frameworks/native/cmds" am: ea6c6b9f85 am: f27645c993
am: 0c328734f5 Change-Id: I75c23bf84de1158e9c3105f23c18c33251552bac
-rw-r--r--cmds/flatland/Android.mk2
-rw-r--r--cmds/flatland/Main.cpp5
-rw-r--r--cmds/ip-up-vpn/Android.mk1
-rw-r--r--cmds/rawbu/Android.mk2
-rw-r--r--cmds/rawbu/backup.cpp1
5 files changed, 5 insertions, 6 deletions
diff --git a/cmds/flatland/Android.mk b/cmds/flatland/Android.mk
index c2951670be..7aa111c7ae 100644
--- a/cmds/flatland/Android.mk
+++ b/cmds/flatland/Android.mk
@@ -8,6 +8,8 @@ LOCAL_SRC_FILES:= \
Renderers.cpp \
Main.cpp \
+LOCAL_CFLAGS := -Wall -Werror
+
LOCAL_MODULE:= flatland
LOCAL_MODULE_TAGS := tests
diff --git a/cmds/flatland/Main.cpp b/cmds/flatland/Main.cpp
index ec1e5432f1..3d7cac0bb3 100644
--- a/cmds/flatland/Main.cpp
+++ b/cmds/flatland/Main.cpp
@@ -284,7 +284,6 @@ class Layer {
public:
Layer() :
- mFirstFrame(true),
mGLHelper(NULL),
mSurface(EGL_NO_SURFACE) {
}
@@ -358,8 +357,6 @@ public:
}
private:
- bool mFirstFrame;
-
LayerDesc mDesc;
GLHelper* mGLHelper;
@@ -389,7 +386,6 @@ public:
ATRACE_CALL();
bool result;
- EGLint resulte;
float scaleFactor = float(mDesc.runHeights[mInstance]) /
float(mDesc.height);
@@ -465,7 +461,6 @@ public:
ATRACE_CALL();
bool result;
- status_t err;
resetColorGenerator();
diff --git a/cmds/ip-up-vpn/Android.mk b/cmds/ip-up-vpn/Android.mk
index 36bbdf543b..e1e2204233 100644
--- a/cmds/ip-up-vpn/Android.mk
+++ b/cmds/ip-up-vpn/Android.mk
@@ -18,6 +18,7 @@ LOCAL_PATH := $(call my-dir)
include $(CLEAR_VARS)
LOCAL_SRC_FILES := ip-up-vpn.c
+LOCAL_CFLAGS := -Wall -Werror
LOCAL_SHARED_LIBRARIES := libcutils liblog
LOCAL_MODULE := ip-up-vpn
LOCAL_MODULE_PATH := $(TARGET_OUT_ETC)/ppp
diff --git a/cmds/rawbu/Android.mk b/cmds/rawbu/Android.mk
index b5803905e1..932215105e 100644
--- a/cmds/rawbu/Android.mk
+++ b/cmds/rawbu/Android.mk
@@ -5,6 +5,8 @@ include $(CLEAR_VARS)
LOCAL_SRC_FILES:= backup.cpp
+LOCAL_CFLAGS := -Wall -Werror
+
LOCAL_SHARED_LIBRARIES := libcutils libc
LOCAL_MODULE:= rawbu
diff --git a/cmds/rawbu/backup.cpp b/cmds/rawbu/backup.cpp
index ff6719f58a..0072281d4d 100644
--- a/cmds/rawbu/backup.cpp
+++ b/cmds/rawbu/backup.cpp
@@ -129,7 +129,6 @@ static int wipe (const char *path)
}
if(S_ISDIR(statBuffer.st_mode)) {
- int i;
char *newpath;
newpath = strdup(nameBuffer);