diff --git a/gps/build/target_specific_features.mk b/gps/build/target_specific_features.mk
index 55395983..5b13125d 100644
--- a/gps/build/target_specific_features.mk
+++ b/gps/build/target_specific_features.mk
@@ -3,14 +3,15 @@ GNSS_CFLAGS := \
     -Wno-error=unused-parameter \
     -Wno-error=macro-redefined \
     -Wno-error=reorder \
+    -Wno-reorder-ctor \
     -Wno-error=missing-braces \
     -Wno-error=self-assign \
-    -Wno-error=enum-conversion \
+    -Wno-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-undefined-bool-conversion \
     -Wno-error=tautological-compare \
     -Wno-error=switch \
     -Wno-error=date-time
diff --git a/gps/pla/Android.mk b/gps/pla/Android.mk
index a57861d9..bb37f898 100644
--- a/gps/pla/Android.mk
+++ b/gps/pla/Android.mk
@@ -3,14 +3,15 @@ GNSS_CFLAGS := \
     -Wno-error=unused-parameter \
     -Wno-error=macro-redefined \
     -Wno-error=reorder \
+    -Wno-reorder-ctor \
     -Wno-error=missing-braces \
     -Wno-error=self-assign \
-    -Wno-error=enum-conversion \
+    -Wno-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-undefined-bool-conversion \
     -Wno-error=tautological-compare \
     -Wno-error=switch \
     -Wno-error=date-time