diff --git a/gps/Android.bp b/gps/Android.bp
index e0fba1f..9015915 100644
--- a/gps/Android.bp
+++ b/gps/Android.bp
@@ -7,19 +7,7 @@ GNSS_CFLAGS = [
     "-Wunused-function",
     "-Wimplicit-fallthrough",
     "-Wno-unused-parameter",
-    "-Wno-error=unused-parameter",
-    "-Wno-error=macro-redefined",
-    "-Wno-error=reorder",
-    "-Wno-error=missing-braces",
-    "-Wno-error=self-assign",
-    "-Wno-error=enum-conversion",
-    "-Wno-error=logical-op-parentheses",
-    "-Wno-error=null-arithmetic",
-    "-Wno-error=null-conversion",
-    "-Wno-error=parentheses-equality",
-    "-Wno-error=undefined-bool-conversion",
-    "-Wno-error=tautological-compare",
-    "-Wno-error=switch",
+    "-Wno-undefined-bool-conversion",
 ]
 
 /* Activate the following for debug purposes only,
diff --git a/gps/Android.mk b/gps/Android.mk
index f020087..cf33a3c 100644
--- a/gps/Android.mk
+++ b/gps/Android.mk
@@ -10,19 +10,7 @@ GNSS_CFLAGS := \
     -Wunused-function \
     -Wimplicit-fallthrough \
     -Wno-unused-parameter \
-    -Wno-error=unused-parameter \
-    -Wno-error=macro-redefined \
-    -Wno-error=reorder \
-    -Wno-error=missing-braces \
-    -Wno-error=self-assign \
-    -Wno-error=enum-conversion \
-    -Wno-error=logical-op-parentheses \
-    -Wno-error=null-arithmetic \
-    -Wno-error=null-conversion \
-    -Wno-error=parentheses-equality \
-    -Wno-error=undefined-bool-conversion \
-    -Wno-error=tautological-compare \
-    -Wno-error=switch
+    -Wno-undefined-bool-conversion
 
 GNSS_HIDL_VERSION := 2.1
 GNSS_AIDL_VERSION := 1