Snap for 4393550 from bba672d937d1f6f0ded8a69f9aec0e097cd2d236 to pi-release

Change-Id: Ib5814594f0c91050443c9f7ef4fce8759eabe2f5
diff --git a/Android.mk b/Android.mk
index e3f2c27..f8d9c51 100644
--- a/Android.mk
+++ b/Android.mk
@@ -21,6 +21,10 @@
 
 LOCAL_SRC_FILES := src/safe_iop.c
 
+LOCAL_CFLAGS := \
+    -Wall -Werror \
+    -Wno-unused-parameter \
+
 LOCAL_MODULE := libsafe_iop
 
 include $(BUILD_STATIC_LIBRARY)
diff --git a/testsuite/Android.mk b/testsuite/Android.mk
index 942ae91..0cb820c 100644
--- a/testsuite/Android.mk
+++ b/testsuite/Android.mk
@@ -20,7 +20,10 @@
 
 # TODO: make the test use the compiled static lib.
 LOCAL_SRC_FILES := ../src/safe_iop.c
-LOCAL_CFLAGS := -DSAFE_IOP_TEST=1 -DNDEBUG=1
+LOCAL_CFLAGS := \
+    -DSAFE_IOP_TEST=1 -DNDEBUG=1 \
+    -Wall -Werror \
+    -Wno-unused-parameter \
 
 LOCAL_MODULE_PATH := $(TARGET_OUT_OPTIONAL_EXECUTABLES)
 LOCAL_MODULE_TAGS := optional