X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=Android.bp;h=1e6aa1a58223197813ba4d11ff27ad2bccbecda8;hb=3fcbc9ffbeaa0df3dd06113b61f9b3bed4efb92e;hp=3ed16a844c2e832b54976b302052caad77e33027;hpb=c4749950337327946f969b3bfeb67b3cdf60672a;p=tools%2Fe2fsprogs.git

diff --git a/Android.bp b/Android.bp
index 3ed16a8..1e6aa1a 100644
--- a/Android.bp
+++ b/Android.bp
@@ -42,20 +42,25 @@ 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: {
-        darwin: {
-            // Still has unfixed/unsuppressed warnings.
-            cflags: ["-Wno-error"],
-        },
-        windows: {
-            cflags: [
-                "-Wno-typedef-redefinition",
-                "-Wno-unused-parameter",
-            ],
-        },
         bionic: {
-            system_shared_libs: ["libc", "libdl"],
+            system_shared_libs: [
+                "libc",
+                "libdl",
+            ],
         },
         windows: {
             include_dirs: ["external/e2fsprogs/include/mingw"],