AOSP: Suppress warnings/errors for clang+mingw

Hide unused parameters/variables warnings for mingw.

There are a lot of typedef redefinition errors (warnings) stemming from
linux/types.h being included after ext2_types.h

Bug: 69933068
Test: mmma external/e2fsprogs
Change-Id: Id0815e9e01f4c137fb57696f7afd37935ebd35a1
From AOSP commit: 5155fb404659d345ee4b536673ac83b0f822e8a3

diff --git a/include/mingw/linux/types.h b/include/mingw/linux/types.h
index eb870113b25803a31e3b2b07b68cde17581bebe7..9631456685df72ae55d108b8816753ec5ed519bf 100644 (file)
--- a/include/mingw/linux/types.h
+++ b/include/mingw/linux/types.h
@@ -10,9 +10,6 @@
 typedef unsigned __int8 __u8;
 typedef signed __int8 __s8;
 
-typedef signed   __int64 __s64;
-typedef unsigned __int64 __u64;
-
 typedef        signed   __int16        __s16;
 typedef        unsigned __int16        __u16;
 

diff --git a/lib/blkid/Android.bp b/lib/blkid/Android.bp
index 53381df82ac4e61dfbcad2bc89406010cfd090d6..2455d39049f25d617b794db14c3fa47f87d06d5e 100644 (file)
--- a/lib/blkid/Android.bp
+++ b/lib/blkid/Android.bp
@@ -25,6 +25,10 @@ cc_library {
             include_dirs: [ "external/e2fsprogs/include/mingw" ],
             cflags: [
                 "-Wno-pointer-to-int-cast",
+                "-Wno-unused-variable",
+            ],
+            clang_cflags: [
+                "-Wno-error=typedef-redefinition",
             ],
             enabled: true
         },

diff --git a/lib/e2p/Android.bp b/lib/e2p/Android.bp
index 9d5b0b619641485b64b60140b72859ae0df62865..5ce3e020e2543f09998c3bb1c38efa534a5e5274 100644 (file)
--- a/lib/e2p/Android.bp
+++ b/lib/e2p/Android.bp
@@ -38,7 +38,14 @@ cc_library {
     target: {
         windows: {
             include_dirs: [ "external/e2fsprogs/include/mingw" ],
-            enabled: true
+            enabled: true,
+            cflags: [
+                "-Wno-unused-variable",
+                "-Wno-unused-parameter",
+            ],
+            clang_cflags: [
+                "-Wno-error=typedef-redefinition",
+            ],
         },
     },
 

diff --git a/lib/et/Android.bp b/lib/et/Android.bp
index f6ad416bb80991fffbed5a16d5102cc6b0500f94..572c805f3f86a61a31f112e522fe501f06433b44 100644 (file)
--- a/lib/et/Android.bp
+++ b/lib/et/Android.bp
@@ -19,6 +19,9 @@ cc_library {
     target: {
         windows: {
             enabled: true,
+            cflags: [
+                "-Wno-unused-variable",
+            ],
         },
     },
 

diff --git a/lib/ext2fs/Android.bp b/lib/ext2fs/Android.bp
index 62bcba405f0f7ded0c0756a1c3a9a4eed3778bc0..8f389ec74ae155e636578e40455f666d7a0ab81e 100644 (file)
--- a/lib/ext2fs/Android.bp
+++ b/lib/ext2fs/Android.bp
@@ -117,6 +117,10 @@ cc_library {
             include_dirs: [ "external/e2fsprogs/include/mingw" ],
             cflags: [
                 "-Wno-format",
+                "-Wno-unused-variable",
+            ],
+            clang_cflags: [
+                "-Wno-error=typedef-redefinition",
             ],
             host_ldlibs: ["-lws2_32"],
         },

diff --git a/misc/Android.bp b/misc/Android.bp
index 9267b413114ab0a78c4d08fde2225b9ecb8f2421..e0be986c3e59743060d5589242248b52d87e360d 100644 (file)
--- a/misc/Android.bp
+++ b/misc/Android.bp
@@ -9,7 +9,8 @@ cc_library {
     target: {
         windows: {
             include_dirs: [ "external/e2fsprogs/include/mingw" ],
-            enabled: true
+            enabled: true,
+            cflags: ["-Wno-unused-variable"],
         },
     },