diff options
| author | Dan Willemsen <dwillemsen@google.com> | 2017-11-29 20:20:04 -0800 |
|---|---|---|
| committer | Theodore Ts'o <tytso@mit.edu> | 2018-02-26 13:34:35 -0500 |
| commit | 182fa0cd61fe706c2eaa308e1c30688f20b946a9 (patch) | |
| tree | 38ad156d334292539b8fedb648d1758c0792490e | |
| parent | 6ddf78d22d646c301f37d5c210c7c2cce8d92bb4 (diff) | |
| download | e2fsprogs-182fa0cd61fe706c2eaa308e1c30688f20b946a9.tar.gz | |
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
| -rw-r--r-- | include/mingw/linux/types.h | 3 | ||||
| -rw-r--r-- | lib/blkid/Android.bp | 4 | ||||
| -rw-r--r-- | lib/e2p/Android.bp | 9 | ||||
| -rw-r--r-- | lib/et/Android.bp | 3 | ||||
| -rw-r--r-- | lib/ext2fs/Android.bp | 4 | ||||
| -rw-r--r-- | misc/Android.bp | 3 |
6 files changed, 21 insertions, 5 deletions
diff --git a/include/mingw/linux/types.h b/include/mingw/linux/types.h index eb870113b..963145668 100644 --- 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 53381df82..2455d3904 100644 --- 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 9d5b0b619..5ce3e020e 100644 --- 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 f6ad416bb..572c805f3 100644 --- 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 62bcba405..8f389ec74 100644 --- 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 9267b4131..e0be986c3 100644 --- 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"], }, }, |