From 182fa0cd61fe706c2eaa308e1c30688f20b946a9 Mon Sep 17 00:00:00 2001 From: Dan Willemsen Date: Wed, 29 Nov 2017 20:20:04 -0800 Subject: [PATCH] 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 --- include/mingw/linux/types.h | 3 --- lib/blkid/Android.bp | 4 ++++ lib/e2p/Android.bp | 9 ++++++++- lib/et/Android.bp | 3 +++ lib/ext2fs/Android.bp | 4 ++++ 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 eb87011..9631456 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 53381df..2455d39 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 9d5b0b6..5ce3e02 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 f6ad416..572c805 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 62bcba4..8f389ec 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 9267b41..e0be986 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"], }, }, -- 1.8.3.1