AOSP: Disable macro redefined warnings.

The new kernel headers do:

  #define __bitwise __bitwise__

However, the code redefines __bitwise without undef'ing it first.

This is a temporary fix, b/35721782 filed to fix this.

Change-Id: I2c6a64146966f1737835f012d24ccc844570d02b
Test: Builds without warningers/errors.
From AOSP commit: commit 91581e8f15b8a29aedea3e7c11162301c7e66ec3

Signed-off-by: Theodore Ts'o <tytso@mit.edu>

diff --git a/contrib/Android.bp b/contrib/Android.bp
index 585a8f13a55e1a690dac00e961401fb5a21e134d..c2d5cd91a58ad76bdf83c9e7732e4d235f889c5b 100644 (file)
--- 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 b60b45354f5ad185de816af478dbb6d2e9821f53..013a42182d6c1af46d0a565f9bc99304f4baa93c 100644 (file)
--- 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 0e1f9b88162b3efaf2a7fb7bd284f5a4b59d9a64..1cabe86d71fb2c09916a19663204f36d53d97ac4 100644 (file)
--- 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 9a3f2766c5930ab4058026fd3544b73de4b579b7..9b385f9c6398389521c9a98327c0453255473db2 100644 (file)
--- 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 9c344df7c2f5d8f15226647b34b390c030dfaeeb..db516707abedfcbc4b6d377530519344b066741c 100644 (file)
--- 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 73b11a397d819d694af7b0d361172eed4b9da57e..df07a9b7e7bc10742ccdc1eb4203c277c720807a 100644 (file)
--- 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 11248b423939341f85eeeab8ce579121ae3daa27..24414a45ecf2d6302dca0889023c26c2b5140f97 100644 (file)
--- 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 f75c9d158e488c7274cd87dd2b95c0fdb3d20468..e36bf93dbd7365fb119365b07f1af881c6febcf6 100644 (file)
--- 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 5d8f0e8b94af73fe4a0d293feefa918e7a2efaa6..6d3d32173df8cdee1dccc332170ce74e400e9ec3 100644 (file)
--- 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",