diff --git a/Android.bp b/Android.bp
index 35e8fc0..5d162ae 100644
--- a/Android.bp
+++ b/Android.bp
@@ -4,6 +4,9 @@ cc_library_static {
     cflags: [
         "-fPIC",
         "-O3",
+        "-Wall",
+        "-Werror",
+        "-Wno-unused-variable",
     ],
 
     export_include_dirs: [
@@ -238,6 +241,9 @@ cc_library_static {
         "-fPIC",
 
         "-O3",
+        "-Wall",
+        "-Werror",
+        "-Wno-error=constant-conversion",
     ],
 
     export_include_dirs: [
diff --git a/test/Android.bp b/test/Android.bp
index 5fef68b..9e34a51 100644
--- a/test/Android.bp
+++ b/test/Android.bp
@@ -7,6 +7,8 @@ cc_test {
         "-DARM",
         "-DMD5_DISABLE",
         "-fPIC",
+        "-Wall",
+        "-Werror",
     ],
     local_include_dirs: [
         "decoder/",
@@ -26,6 +28,9 @@ cc_test {
         "-DMD5_DISABLE",
         "-fPIC",
         "-pie",
+        "-Wall",
+        "-Werror",
+        "-Wno-unused-variable",
     ],
     local_include_dirs: [
         "encoder/",