1 files changed, 15 insertions, 24 deletions

diff --git a/misc/Android.bp b/misc/Android.bp
index 326880f6..e2c3d11b 100644
--- a/misc/Android.bp
+++ b/misc/Android.bp
@@ -5,7 +5,6 @@
 cc_library {
     name: "libext2_misc",
     host_supported: true,
-    defaults: ["e2fsprogs-defaults"],
 
     target: {
         windows: {
@@ -17,7 +16,7 @@ cc_library {
     srcs: [
         "create_inode.c",
     ],
-    cflags: ["-Wno-error=format-extra-args"],
+    cflags: ["-W", "-Wall"],
     shared_libs: [
         "libext2_quota",
         "libext2fs",
@@ -32,7 +31,6 @@ cc_library {
 cc_binary {
     name: "mke2fs",
     host_supported: true,
-    defaults: ["e2fsprogs-defaults"],
 
     srcs: [
         "mke2fs.c",
@@ -43,11 +41,7 @@ cc_binary {
     required: [
         "mke2fs.conf",
     ],
-    cflags: [
-        "-Wno-error=format",
-        "-Wno-error=type-limits",
-        "-Wno-format-extra-args",
-    ],
+    cflags: ["-W", "-Wall", "-Wno-macro-redefined"],
     target: {
         host: {
             static_libs: [
@@ -65,14 +59,7 @@ cc_binary {
         },
         windows: {
             include_dirs: [ "external/e2fsprogs/include/mingw" ],
-            cflags: [
-                "-D_POSIX",
-                "-D__USE_MINGW_ALARM",
-                // mke2fs.c has a warning from gcc which cannot be suppressed:
-                // passing argument 3 of 'ext2fs_get_device_size' from
-                // incompatible pointer type
-                "-Wno-error"
-            ],
+            cflags: ["-D_POSIX", "-D__USE_MINGW_ALARM"],
             ldflags: ["-static"],
             host_ldlibs: ["-lws2_32"],
             enabled: true
@@ -98,12 +85,16 @@ cc_binary {
 
 cc_defaults {
     name: "tune2fs-defaults",
-    defaults: ["e2fsprogs-defaults"],
     srcs: [
         "tune2fs.c",
         "util.c",
     ],
-    cflags: ["-DNO_RECOVERY"],
+    cflags: [
+        "-W",
+        "-Wall",
+        "-DNO_RECOVERY",
+        "-Wno-macro-redefined",
+    ],
     include_dirs: ["external/e2fsprogs/e2fsck"],
 }
 
@@ -147,9 +138,9 @@ cc_library_static {
 cc_binary {
     name: "badblocks",
     host_supported: true,
-    defaults: ["e2fsprogs-defaults"],
 
     srcs: ["badblocks.c"],
+    cflags: ["-W", "-Wall", "-Wno-macro-redefined"],
     shared_libs: [
         "libext2fs",
         "libext2_com_err",
@@ -166,9 +157,9 @@ cc_binary {
 cc_binary {
     name: "chattr",
     host_supported: true,
-    defaults: ["e2fsprogs-defaults"],
 
     srcs: ["chattr.c"],
+    cflags: ["-W", "-Wall", "-Wno-macro-redefined"],
     shared_libs: [
         "libext2_com_err",
         "libext2_e2p",
@@ -182,7 +173,7 @@ cc_binary {
 cc_defaults {
     name: "lsattr-defaults",
     srcs: ["lsattr.c"],
-    defaults: ["e2fsprogs-defaults"],
+    cflags: ["-W", "-Wall", "-Wno-macro-redefined"],
 }
 
 lsattr_libs = [
@@ -212,9 +203,9 @@ cc_binary {
 
 cc_binary {
     name: "blkid",
-    defaults: ["e2fsprogs-defaults"],
 
     srcs: ["blkid.c"],
+    cflags: ["-W", "-Wall", "-Wno-macro-redefined"],
     shared_libs: [
         "libext2fs",
         "libext2_blkid",
@@ -230,9 +221,9 @@ cc_binary {
 cc_binary {
     name: "e4crypt",
     host_supported: true,
-    defaults: ["e2fsprogs-defaults"],
 
     srcs: ["e4crypt.c"],
+    cflags: ["-W", "-Wall", "-Wno-macro-redefined"],
     shared_libs: [
         "libext2fs",
         "libext2_uuid",
@@ -252,9 +243,9 @@ cc_binary {
 cc_binary {
     name: "e2image",
     host_supported: true,
-    defaults: ["e2fsprogs-defaults"],
 
     srcs: ["e2image.c"],
+    cflags: ["-W", "-Wall", "-Wno-macro-redefined"],
     shared_libs: [
         "libext2fs",
         "libext2_blkid",