diff --git a/gps/Android.bp b/gps/Android.bp
index 5f2626f..395136c 100644
--- a/gps/Android.bp
+++ b/gps/Android.bp
@@ -1,17 +1,4 @@
 GNSS_CFLAGS = [
     "-Werror",
-    "-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-error=date-time",
+    "-Wno-undefined-bool-conversion",
 ]
diff --git a/location/Android.bp b/location/Android.bp
index 0681f67..fb78f04 100644
--- a/location/Android.bp
+++ b/location/Android.bp
@@ -1,19 +1,6 @@
 GNSS_CFLAGS = [
     "-Werror",
-    "-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-error=date-time",
+    "-Wno-undefined-bool-conversion",
 ]
 
 /* Activate the following for debug purposes only,