diff options
-rw-r--r-- | contrib/Android.bp | 4 | ||||
-rw-r--r-- | debugfs/Android.bp | 1 | ||||
-rw-r--r-- | e2fsck/Android.bp | 2 | ||||
-rw-r--r-- | lib/blkid/Android.bp | 1 | ||||
-rw-r--r-- | lib/e2p/Android.bp | 1 | ||||
-rw-r--r-- | lib/ext2fs/Android.bp | 1 | ||||
-rw-r--r-- | lib/support/Android.bp | 1 | ||||
-rw-r--r-- | misc/Android.bp | 17 | ||||
-rw-r--r-- | resize/Android.bp | 2 |
9 files changed, 18 insertions, 12 deletions
diff --git a/contrib/Android.bp b/contrib/Android.bp index 585a8f13..c2d5cd91 100644 --- a/contrib/Android.bp +++ b/contrib/Android.bp @@ -10,7 +10,7 @@ cc_binary { host_supported: true, srcs: ["fsstress.c"], - cflags: ["-W", "-Wall"], + cflags: ["-W", "-Wall", "-Wno-macro-redefined"], system_shared_libs: ["libc"], target: { @@ -28,7 +28,7 @@ cc_binary { host_supported: true, srcs: ["add_ext4_encrypt.c"], - cflags: ["-W", "-Wall"], + cflags: ["-W", "-Wall", "-Wno-macro-redefined"], shared_libs: [ "libext2fs", "libext2_com_err", diff --git a/debugfs/Android.bp b/debugfs/Android.bp index b60b4535..013a4218 100644 --- a/debugfs/Android.bp +++ b/debugfs/Android.bp @@ -34,6 +34,7 @@ cc_defaults { cflags: [ "-W", "-Wall", + "-Wno-macro-redefined", "-fno-strict-aliasing", "-DDEBUGFS", ], diff --git a/e2fsck/Android.bp b/e2fsck/Android.bp index 0e1f9b88..1cabe86d 100644 --- a/e2fsck/Android.bp +++ b/e2fsck/Android.bp @@ -34,7 +34,7 @@ cc_defaults { "readahead.c", "extents.c", ], - cflags: ["-W", "-Wall", "-fno-strict-aliasing"], + cflags: ["-W", "-Wall", "-Wno-macro-redefined", "-fno-strict-aliasing"], } e2fsck_libs = [ diff --git a/lib/blkid/Android.bp b/lib/blkid/Android.bp index 9a3f2766..9b385f9c 100644 --- a/lib/blkid/Android.bp +++ b/lib/blkid/Android.bp @@ -24,6 +24,7 @@ cc_library { "-W", "-Wall", "-fno-strict-aliasing", + "-Wno-macro-redefined", ], header_libs: ["libext2-headers"], diff --git a/lib/e2p/Android.bp b/lib/e2p/Android.bp index 9c344df7..db516707 100644 --- a/lib/e2p/Android.bp +++ b/lib/e2p/Android.bp @@ -32,6 +32,7 @@ cc_library { cflags: [ "-W", "-Wall", + "-Wno-macro-redefined", ], header_libs: ["libext2-headers"], diff --git a/lib/ext2fs/Android.bp b/lib/ext2fs/Android.bp index 73b11a39..df07a9b7 100644 --- a/lib/ext2fs/Android.bp +++ b/lib/ext2fs/Android.bp @@ -97,6 +97,7 @@ cc_library { "-W", "-Wall", "-Wno-unused-parameter", + "-Wno-macro-redefined", ], target: { host: { diff --git a/lib/support/Android.bp b/lib/support/Android.bp index 11248b42..24414a45 100644 --- a/lib/support/Android.bp +++ b/lib/support/Android.bp @@ -25,6 +25,7 @@ cc_library { cflags: [ "-W", "-Wall", + "-Wno-macro-redefined", ], header_libs: ["libext2-headers"], diff --git a/misc/Android.bp b/misc/Android.bp index f75c9d15..e36bf93d 100644 --- a/misc/Android.bp +++ b/misc/Android.bp @@ -9,7 +9,7 @@ cc_library { srcs: [ "create_inode.c", ], - cflags: ["-W", "-Wall"], + cflags: ["-W", "-Wall", "-Wno-macro-redefined"], shared_libs: [ "libext2_quota", "libext2fs", @@ -32,7 +32,7 @@ cc_binary { "default_profile.c", "create_inode.c", ], - cflags: ["-W", "-Wall"], + cflags: ["-W", "-Wall", "-Wno-macro-redefined"], shared_libs: [ "libext2fs", "libext2_blkid", @@ -58,6 +58,7 @@ cc_defaults { "-W", "-Wall", "-DNO_RECOVERY", + "-Wno-macro-redefined", ], include_dirs: ["external/e2fsprogs/e2fsck"], } @@ -104,7 +105,7 @@ cc_binary { host_supported: true, srcs: ["badblocks.c"], - cflags: ["-W", "-Wall"], + cflags: ["-W", "-Wall", "-Wno-macro-redefined"], shared_libs: [ "libext2fs", "libext2_com_err", @@ -123,7 +124,7 @@ cc_binary { host_supported: true, srcs: ["chattr.c"], - cflags: ["-W", "-Wall"], + cflags: ["-W", "-Wall", "-Wno-macro-redefined"], shared_libs: [ "libext2_com_err", "libext2_e2p", @@ -137,7 +138,7 @@ cc_binary { cc_defaults { name: "lsattr-defaults", srcs: ["lsattr.c"], - cflags: ["-W", "-Wall"], + cflags: ["-W", "-Wall", "-Wno-macro-redefined"], } lsattr_libs = [ @@ -169,7 +170,7 @@ cc_binary { name: "blkid", srcs: ["blkid.c"], - cflags: ["-W", "-Wall"], + cflags: ["-W", "-Wall", "-Wno-macro-redefined"], shared_libs: [ "libext2fs", "libext2_blkid", @@ -187,7 +188,7 @@ cc_binary { host_supported: true, srcs: ["e4crypt.c"], - cflags: ["-W", "-Wall"], + cflags: ["-W", "-Wall", "-Wno-macro-redefined"], shared_libs: [ "libext2fs", "libext2_uuid", @@ -209,7 +210,7 @@ cc_binary { host_supported: true, srcs: ["e2image.c"], - cflags: ["-W", "-Wall"], + cflags: ["-W", "-Wall", "-Wno-macro-redefined"], shared_libs: [ "libext2fs", "libext2_blkid", diff --git a/resize/Android.bp b/resize/Android.bp index 5d8f0e8b..6d3d3217 100644 --- a/resize/Android.bp +++ b/resize/Android.bp @@ -12,7 +12,7 @@ cc_binary { "sim_progress.c", "resource_track.c", ], - cflags: ["-W", "-Wall"], + cflags: ["-W", "-Wall", "-Wno-macro-redefined"], shared_libs: [ "libext2fs", "libext2_com_err", |