diff options
| author | Dan Willemsen <dwillemsen@google.com> | 2017-11-30 20:34:27 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-11-30 20:34:27 +0000 |
| commit | 6fd11f3bc94c5f4019e0d762f6381b105e6745b2 (patch) | |
| tree | 77515c77b99aceac20cc1439c0ab51d8e425539a | |
| parent | c1a5a9b1ab432490f3282208e947d0c8917580ef (diff) | |
| parent | c010544766c02529438565ebac8fb931d632a5d8 (diff) | |
| download | e2fsprogs-6fd11f3bc94c5f4019e0d762f6381b105e6745b2.tar.gz | |
Merge "Suppress warnings/errors for clang+mingw" am: d8d3ba7dda
am: c010544766
Change-Id: Ie77958b71b800b232411aa4a20f890b099e82d5f
| -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 eb870113..96314566 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 49a6be45..225716cd 100644 --- a/lib/blkid/Android.bp +++ b/lib/blkid/Android.bp @@ -26,6 +26,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 a350e68a..21089d7b 100644 --- a/lib/e2p/Android.bp +++ b/lib/e2p/Android.bp @@ -35,7 +35,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 edd0661f..670d8ee4 100644 --- a/lib/et/Android.bp +++ b/lib/et/Android.bp @@ -16,6 +16,9 @@ cc_library { target: { windows: { enabled: true, + cflags: [ + "-Wno-unused-variable", + ], }, }, diff --git a/lib/ext2fs/Android.bp b/lib/ext2fs/Android.bp index 404fedd9..427d93be 100644 --- a/lib/ext2fs/Android.bp +++ b/lib/ext2fs/Android.bp @@ -114,6 +114,10 @@ cc_library { cflags: [ "-Wno-error=cpp", "-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 326880f6..fc00a692 100644 --- a/misc/Android.bp +++ b/misc/Android.bp @@ -10,7 +10,8 @@ cc_library { target: { windows: { include_dirs: [ "external/e2fsprogs/include/mingw" ], - enabled: true + enabled: true, + cflags: ["-Wno-unused-variable"], }, }, |