Merge "Ignore new compiler warnings"
diff --git a/Android.bp b/Android.bp
index a73b7ec..d88e736 100644
--- a/Android.bp
+++ b/Android.bp
@@ -36,6 +36,8 @@
 
     cflags: [
         "-Wno-unused-parameter",
+        "-Wno-visibility",
+        "-Wno-incompatible-pointer-types",
         "-Werror",
     ],
 
@@ -234,6 +236,8 @@
 
     cflags: [
         "-Wno-unused-parameter",
+        "-Wno-visibility",
+        "-Wno-incompatible-pointer-types",
         "-Werror",
     ],
 
diff --git a/lib/sanitizer_common/tests/Android.bp b/lib/sanitizer_common/tests/Android.bp
index 02d7daf..b82c2de 100644
--- a/lib/sanitizer_common/tests/Android.bp
+++ b/lib/sanitizer_common/tests/Android.bp
@@ -29,6 +29,7 @@
         "-std=c++11",
         "-Wno-unused-parameter",
         "-Wno-non-virtual-dtor",
+        "-Wno-format",
     ],
 
     include_dirs: ["external/compiler-rt/lib"],