diff --git a/Android.mk b/Android.mk
index 9df8fe7..aa2f4b5 100644
--- a/Android.mk
+++ b/Android.mk
@@ -1,2 +1,2 @@
 LOCAL_PATH := $(call my-dir)
-include $(call all-subdir-makefiles)
\ No newline at end of file
+include $(call all-subdir-makefiles)
diff --git a/f54test/Android.mk b/f54test/Android.mk
index 56e23d0..81b4521 100644
--- a/f54test/Android.mk
+++ b/f54test/Android.mk
@@ -4,7 +4,11 @@
 LOCAL_MODULE := f54test
 LOCAL_C_INCLUDES := $(LOCAL_PATH)/../rmidevice
 LOCAL_SRC_FILES := main.cpp f54test.cpp testutil.cpp display.cpp
-LOCAL_CPPFLAGS := -Wall
+LOCAL_CFLAGS := \
+    -Wall -Werror \
+    -Wno-sometimes-uninitialized \
+    -Wno-unused-parameter \
+
 LOCAL_STATIC_LIBRARIES := rmidevice
 
 include $(BUILD_EXECUTABLE)
diff --git a/rmi4update/Android.mk b/rmi4update/Android.mk
index 77ab32e..fc3d2c5 100644
--- a/rmi4update/Android.mk
+++ b/rmi4update/Android.mk
@@ -4,7 +4,10 @@
 LOCAL_MODULE := rmi4update
 LOCAL_C_INCLUDES := $(LOCAL_PATH)/../rmidevice
 LOCAL_SRC_FILES := main.cpp rmi4update.cpp updateutil.cpp firmware_image.cpp
-LOCAL_CPPFLAGS := -Wall
+LOCAL_CFLAGS := \
+    -Wall -Werror \
+    -Wno-unused-parameter \
+
 LOCAL_STATIC_LIBRARIES := rmidevice
 
 include $(BUILD_EXECUTABLE)
diff --git a/rmidevice/Android.mk b/rmidevice/Android.mk
index 8e23065..3f075d7 100644
--- a/rmidevice/Android.mk
+++ b/rmidevice/Android.mk
@@ -3,6 +3,8 @@
 
 LOCAL_MODULE := rmidevice
 LOCAL_SRC_FILES := rmifunction.cpp rmidevice.cpp hiddevice.cpp
-LOCAL_CPPFLAGS := -Wall
+LOCAL_CFLAGS := \
+    -Wall -Werror \
+    -Wno-unused-parameter \
 
-include $(BUILD_STATIC_LIBRARY)
\ No newline at end of file
+include $(BUILD_STATIC_LIBRARY)
diff --git a/rmihidtool/Android.mk b/rmihidtool/Android.mk
index 28abf10..59a1e4e 100644
--- a/rmihidtool/Android.mk
+++ b/rmihidtool/Android.mk
@@ -4,7 +4,10 @@
 LOCAL_MODULE := rmihidtool
 LOCAL_C_INCLUDES := $(LOCAL_PATH)/../rmidevice
 LOCAL_SRC_FILES := main.cpp
-LOCAL_CPPFLAGS := -Wall
+LOCAL_CFLAGS := \
+    -Wall -Werror \
+    -Wno-unused-parameter \
+
 LOCAL_STATIC_LIBRARIES := rmidevice
 
 include $(BUILD_EXECUTABLE)