diff --git a/gps/Android.bp b/gps/Android.bp
index 0681f67..fb78f04 100644
--- a/gps/Android.bp
+++ b/gps/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,
diff --git a/gps/Android.mk b/gps/Android.mk
index 88bb0f4..60c9aa8 100644
--- a/gps/Android.mk
+++ b/gps/Android.mk
@@ -3,20 +3,7 @@ ifneq ($(BOARD_VENDOR_QCOM_GPS_LOC_API_HARDWARE),)
 # Set required flags
 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
 
 GNSS_HIDL_VERSION = 2.1