1 files changed, 22 insertions, 11 deletions
diff --git a/Android.bp b/Android.bp
index e596664b..46f63348 100644
--- a/Android.bp
+++ b/Android.bp
@@ -42,21 +42,32 @@ license {
 
 cc_defaults {
     name: "e2fsprogs-defaults",
-    cflags: ["-Wall", "-Werror", "-Wno-pointer-arith"],
+    cflags: [
+        "-Wall",
+        "-Werror",
+        // Some warnings that Android's build system enables by default are not
+        // supported by upstream e2fsprogs.  When such a warning shows up,
+        // disable it below.  Please don't disable warnings that upstream
+        // e2fsprogs is supposed to support; for those, fix the code instead.
+        "-Wno-pointer-arith",
+        "-Wno-sign-compare",
+        "-Wno-type-limits",
+        "-Wno-typedef-redefinition",
+        "-Wno-unused-parameter",
+    ],
     target: {
+        bionic: {
+            system_shared_libs: [
+                "libc",
+                "libdl",
+            ],
+        },
         darwin: {
-            // Still has unfixed/unsuppressed warnings.
-            cflags: ["-Wno-error"],
+            // This matches what the upstream CI uses
+            cflags: ["-Wno-error=deprecated-declarations"],
         },
         windows: {
-            cflags: [
-                "-Wno-typedef-redefinition",
-                "-Wno-unused-parameter",
-                "-Wno-unused-variable",
-            ],
-        },
-        bionic: {
-            system_shared_libs: ["libc", "libdl"],
+            include_dirs: ["external/e2fsprogs/include/mingw"],
         },
     },
 }