diff options
author | Jin Qian <jinqian@google.com> | 2017-10-14 00:35:30 +0000 |
---|---|---|
committer | Jin Qian <jinqian@google.com> | 2017-10-14 00:35:30 +0000 |
commit | ec02acfd8576df4bd0779c9f88f32e02355c5d2c (patch) | |
tree | 8dee3f412d6e27e2813da84442379175c6ec5da2 | |
parent | cd9d95f5c42375d004eb35daa42a1004365d9fae (diff) | |
download | android_external_e2fsprogs-ec02acfd8576df4bd0779c9f88f32e02355c5d2c.tar.gz android_external_e2fsprogs-ec02acfd8576df4bd0779c9f88f32e02355c5d2c.tar.bz2 android_external_e2fsprogs-ec02acfd8576df4bd0779c9f88f32e02355c5d2c.zip |
Revert "Use -Werror in external/e2fsprogs"
This reverts commit cd9d95f5c42375d004eb35daa42a1004365d9fae.
Change-Id: I16e52d4088c5b85dd23de519cb5af8aefeef85e6
-rw-r--r-- | Android.bp | 6 | ||||
-rw-r--r-- | contrib/Android.bp | 9 | ||||
-rw-r--r-- | contrib/android/Android.bp | 4 | ||||
-rw-r--r-- | contrib/android/Android.mk | 2 | ||||
-rw-r--r-- | debugfs/Android.bp | 5 | ||||
-rw-r--r-- | e2fsck/Android.bp | 6 | ||||
-rw-r--r-- | lib/blkid/Android.bp | 6 | ||||
-rw-r--r-- | lib/e2p/Android.bp | 7 | ||||
-rw-r--r-- | lib/et/Android.bp | 5 | ||||
-rw-r--r-- | lib/ext2fs/Android.bp | 9 | ||||
-rw-r--r-- | lib/ss/Android.bp | 6 | ||||
-rw-r--r-- | lib/support/Android.bp | 12 | ||||
-rw-r--r-- | lib/uuid/Android.bp | 5 | ||||
-rw-r--r-- | misc/Android.bp | 39 | ||||
-rw-r--r-- | misc/Android.mk | 2 | ||||
-rw-r--r-- | resize/Android.bp | 2 |
16 files changed, 60 insertions, 65 deletions
@@ -1,11 +1,5 @@ // Copyright 2017 The Android Open Source Project -cc_defaults { - name: "e2fsprogs-defaults", - clang_cflags: ["-Wno-error=macro-redefined"], - cflags: ["-Wall", "-Werror"], -} - subdirs = [ "contrib", "debugfs", diff --git a/contrib/Android.bp b/contrib/Android.bp index 200f375c..d4d7874b 100644 --- a/contrib/Android.bp +++ b/contrib/Android.bp @@ -8,14 +8,9 @@ subdirs = ["android"] cc_binary { name: "fsstress", host_supported: true, - defaults: ["e2fsprogs-defaults"], srcs: ["fsstress.c"], - cflags: [ - "-Wno-error=sign-compare", - "-Wno-unused-parameter", - "-Wno-unused-result", - ], + cflags: ["-W", "-Wall", "-Wno-macro-redefined"], system_shared_libs: ["libc", "libdl"], target: { @@ -31,9 +26,9 @@ cc_binary { cc_binary { name: "add_ext4_encrypt", host_supported: true, - defaults: ["e2fsprogs-defaults"], srcs: ["add_ext4_encrypt.c"], + cflags: ["-W", "-Wall", "-Wno-macro-redefined"], shared_libs: [ "libext2fs", "libext2_com_err", diff --git a/contrib/android/Android.bp b/contrib/android/Android.bp index 43c78f86..b4810a47 100644 --- a/contrib/android/Android.bp +++ b/contrib/android/Android.bp @@ -6,7 +6,6 @@ cc_binary { name: "e2fsdroid", host_supported: true, - defaults: ["e2fsprogs-defaults"], srcs: [ "e2fsdroid.c", @@ -18,6 +17,7 @@ cc_binary { "basefs_allocator.c", "hashmap.c", ], + cflags: ["-W", "-Wall"], target: { host: { static_libs: [ @@ -54,9 +54,9 @@ cc_binary { cc_binary { name: "ext2simg", host_supported: true, - defaults: ["e2fsprogs-defaults"], srcs: ["ext2simg.c"], + cflags: ["-W", "-Wall"], shared_libs: [ "libext2fs", "libext2_com_err", diff --git a/contrib/android/Android.mk b/contrib/android/Android.mk index bdfdece5..98ce01d8 100644 --- a/contrib/android/Android.mk +++ b/contrib/android/Android.mk @@ -12,7 +12,7 @@ e2fsdroid_src_files := \ basefs_allocator.c \ hashmap.c \ -e2fsdroid_cflags := -W -Wall -Werror -Wno-error=macro-redefined +e2fsdroid_cflags := -W -Wall e2fsdroid_static_libraries := \ libext2_com_err \ diff --git a/debugfs/Android.bp b/debugfs/Android.bp index 2a7d6222..adaa6354 100644 --- a/debugfs/Android.bp +++ b/debugfs/Android.bp @@ -5,7 +5,6 @@ cc_defaults { name: "debugfs-defaults", - defaults: ["e2fsprogs-defaults"], srcs: [ "debug_cmds.c", "debugfs.c", @@ -32,7 +31,9 @@ cc_defaults { "do_journal.c", ], cflags: [ - "-Wno-unused-variable", + "-W", + "-Wall", + "-Wno-macro-redefined", "-fno-strict-aliasing", "-DDEBUGFS", ], diff --git a/e2fsck/Android.bp b/e2fsck/Android.bp index 475cea12..3eb86595 100644 --- a/e2fsck/Android.bp +++ b/e2fsck/Android.bp @@ -5,7 +5,6 @@ cc_defaults { name: "e2fsck-defaults", - defaults: ["e2fsprogs-defaults"], srcs: [ "e2fsck.c", "super.c", @@ -35,10 +34,7 @@ cc_defaults { "readahead.c", "extents.c", ], - cflags: [ - "-Wno-sign-compare", - "-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 49a6be45..53381df8 100644 --- a/lib/blkid/Android.bp +++ b/lib/blkid/Android.bp @@ -4,7 +4,6 @@ cc_library { name: "libext2_blkid", host_supported: true, unique_host_soname: true, - defaults: ["e2fsprogs-defaults"], srcs: [ "cache.c", "dev.c", @@ -32,9 +31,8 @@ cc_library { }, cflags: [ - "-Wno-error=attributes", - "-Wno-error=pointer-sign", - "-Wno-unused-parameter", + "-W", + "-Wall", "-fno-strict-aliasing", ], diff --git a/lib/e2p/Android.bp b/lib/e2p/Android.bp index a350e68a..9d5b0b61 100644 --- a/lib/e2p/Android.bp +++ b/lib/e2p/Android.bp @@ -4,7 +4,6 @@ cc_library { name: "libext2_e2p", host_supported: true, unique_host_soname: true, - defaults: ["e2fsprogs-defaults"], srcs: [ "feature.c", "fgetflags.c", @@ -30,7 +29,11 @@ cc_library { "percent.c", ], - cflags: ["-Wno-error=attributes"], + cflags: [ + "-W", + "-Wall", + "-Wno-macro-redefined", + ], target: { windows: { diff --git a/lib/et/Android.bp b/lib/et/Android.bp index edd0661f..f6ad416b 100644 --- a/lib/et/Android.bp +++ b/lib/et/Android.bp @@ -4,7 +4,6 @@ cc_library { name: "libext2_com_err", host_supported: true, unique_host_soname: true, - defaults: ["e2fsprogs-defaults"], srcs: [ "error_message.c", "et_name.c", @@ -13,6 +12,10 @@ cc_library { "com_right.c", ], + cflags: [ + "-W", + "-Wall", + ], target: { windows: { enabled: true, diff --git a/lib/ext2fs/Android.bp b/lib/ext2fs/Android.bp index 404fedd9..62bcba40 100644 --- a/lib/ext2fs/Android.bp +++ b/lib/ext2fs/Android.bp @@ -4,7 +4,6 @@ cc_library { name: "libext2fs", host_supported: true, unique_host_soname: true, - defaults: ["e2fsprogs-defaults"], srcs: [ "ext2_err.c", "alloc.c", @@ -95,7 +94,12 @@ cc_library { whole_static_libs: [ "libext2_com_err" ], - cflags: ["-Wno-unused-parameter"], + cflags: [ + "-W", + "-Wall", + "-Wno-unused-parameter", + "-Wno-macro-redefined", + ], target: { host: { // Consider removing this library as a whole for the host. It is not @@ -112,7 +116,6 @@ cc_library { enabled: true, include_dirs: [ "external/e2fsprogs/include/mingw" ], cflags: [ - "-Wno-error=cpp", "-Wno-format", ], host_ldlibs: ["-lws2_32"], diff --git a/lib/ss/Android.bp b/lib/ss/Android.bp index 09332512..06925d73 100644 --- a/lib/ss/Android.bp +++ b/lib/ss/Android.bp @@ -4,7 +4,6 @@ cc_library { name: "libext2_ss", host_supported: true, unique_host_soname: true, - defaults: ["e2fsprogs-defaults"], srcs: [ "ss_err.c", "std_rqs.c", @@ -23,6 +22,11 @@ cc_library { "get_readline.c", ], shared_libs: ["libext2_com_err"], + cflags: [ + "-W", + "-Wall", + ], + header_libs: ["libext2-headers"], export_include_dirs: ["."], export_header_lib_headers: ["libext2-headers"], diff --git a/lib/support/Android.bp b/lib/support/Android.bp index 0ddd0793..4a89b8f3 100644 --- a/lib/support/Android.bp +++ b/lib/support/Android.bp @@ -4,7 +4,6 @@ cc_library { name: "libext2_quota", host_supported: true, unique_host_soname: true, - defaults: ["e2fsprogs-defaults"], srcs: [ "dict.c", "mkquota.c", @@ -28,6 +27,12 @@ cc_library { }, }, + cflags: [ + "-W", + "-Wall", + "-Wno-macro-redefined", + ], + header_libs: ["libext2-headers"], export_include_dirs: ["."], export_header_lib_headers: ["libext2-headers"], @@ -37,12 +42,15 @@ cc_library_shared { name: "libext2_profile", host_supported: true, unique_host_soname: true, - defaults: ["e2fsprogs-defaults"], srcs: [ "prof_err.c", "profile.c", ], + cflags = [ + "-W", + "-Wall", + ], shared_libs: ["libext2_com_err"], header_libs: ["libext2-headers"], diff --git a/lib/uuid/Android.bp b/lib/uuid/Android.bp index 15c12921..b6664f99 100644 --- a/lib/uuid/Android.bp +++ b/lib/uuid/Android.bp @@ -4,7 +4,6 @@ cc_library { name: "libext2_uuid", host_supported: true, unique_host_soname: true, - defaults: ["e2fsprogs-defaults"], srcs: [ "clear.c", "compare.c", @@ -18,13 +17,13 @@ cc_library { "uuid_time.c", ], cflags: [ + "-W", + "-Wall", "-Wno-unused-function", "-Wno-unused-parameter", ], target: { windows: { - // Cannot suppress the _WIN32_WINNT redefined warning. - cflags: ["-Wno-error"], include_dirs: [ "external/e2fsprogs/include/mingw" ], enabled: true }, diff --git a/misc/Android.bp b/misc/Android.bp index 326880f6..e2c3d11b 100644 --- a/misc/Android.bp +++ b/misc/Android.bp @@ -5,7 +5,6 @@ cc_library { name: "libext2_misc", host_supported: true, - defaults: ["e2fsprogs-defaults"], target: { windows: { @@ -17,7 +16,7 @@ cc_library { srcs: [ "create_inode.c", ], - cflags: ["-Wno-error=format-extra-args"], + cflags: ["-W", "-Wall"], shared_libs: [ "libext2_quota", "libext2fs", @@ -32,7 +31,6 @@ cc_library { cc_binary { name: "mke2fs", host_supported: true, - defaults: ["e2fsprogs-defaults"], srcs: [ "mke2fs.c", @@ -43,11 +41,7 @@ cc_binary { required: [ "mke2fs.conf", ], - cflags: [ - "-Wno-error=format", - "-Wno-error=type-limits", - "-Wno-format-extra-args", - ], + cflags: ["-W", "-Wall", "-Wno-macro-redefined"], target: { host: { static_libs: [ @@ -65,14 +59,7 @@ cc_binary { }, windows: { include_dirs: [ "external/e2fsprogs/include/mingw" ], - cflags: [ - "-D_POSIX", - "-D__USE_MINGW_ALARM", - // mke2fs.c has a warning from gcc which cannot be suppressed: - // passing argument 3 of 'ext2fs_get_device_size' from - // incompatible pointer type - "-Wno-error" - ], + cflags: ["-D_POSIX", "-D__USE_MINGW_ALARM"], ldflags: ["-static"], host_ldlibs: ["-lws2_32"], enabled: true @@ -98,12 +85,16 @@ cc_binary { cc_defaults { name: "tune2fs-defaults", - defaults: ["e2fsprogs-defaults"], srcs: [ "tune2fs.c", "util.c", ], - cflags: ["-DNO_RECOVERY"], + cflags: [ + "-W", + "-Wall", + "-DNO_RECOVERY", + "-Wno-macro-redefined", + ], include_dirs: ["external/e2fsprogs/e2fsck"], } @@ -147,9 +138,9 @@ cc_library_static { cc_binary { name: "badblocks", host_supported: true, - defaults: ["e2fsprogs-defaults"], srcs: ["badblocks.c"], + cflags: ["-W", "-Wall", "-Wno-macro-redefined"], shared_libs: [ "libext2fs", "libext2_com_err", @@ -166,9 +157,9 @@ cc_binary { cc_binary { name: "chattr", host_supported: true, - defaults: ["e2fsprogs-defaults"], srcs: ["chattr.c"], + cflags: ["-W", "-Wall", "-Wno-macro-redefined"], shared_libs: [ "libext2_com_err", "libext2_e2p", @@ -182,7 +173,7 @@ cc_binary { cc_defaults { name: "lsattr-defaults", srcs: ["lsattr.c"], - defaults: ["e2fsprogs-defaults"], + cflags: ["-W", "-Wall", "-Wno-macro-redefined"], } lsattr_libs = [ @@ -212,9 +203,9 @@ cc_binary { cc_binary { name: "blkid", - defaults: ["e2fsprogs-defaults"], srcs: ["blkid.c"], + cflags: ["-W", "-Wall", "-Wno-macro-redefined"], shared_libs: [ "libext2fs", "libext2_blkid", @@ -230,9 +221,9 @@ cc_binary { cc_binary { name: "e4crypt", host_supported: true, - defaults: ["e2fsprogs-defaults"], srcs: ["e4crypt.c"], + cflags: ["-W", "-Wall", "-Wno-macro-redefined"], shared_libs: [ "libext2fs", "libext2_uuid", @@ -252,9 +243,9 @@ cc_binary { cc_binary { name: "e2image", host_supported: true, - defaults: ["e2fsprogs-defaults"], srcs: ["e2image.c"], + cflags: ["-W", "-Wall", "-Wno-macro-redefined"], shared_libs: [ "libext2fs", "libext2_blkid", diff --git a/misc/Android.mk b/misc/Android.mk index c9d07353..d3bb8207 100644 --- a/misc/Android.mk +++ b/misc/Android.mk @@ -12,7 +12,7 @@ mke2fs_src_files := \ mke2fs_c_includes := \ external/e2fsprogs/e2fsck -mke2fs_cflags := -W -Wall -Werror -Wno-macro-redefined +mke2fs_cflags := -W -Wall -Wno-macro-redefined mke2fs_static_libraries := \ libext2_blkid \ diff --git a/resize/Android.bp b/resize/Android.bp index d55e24c2..dcdf6591 100644 --- a/resize/Android.bp +++ b/resize/Android.bp @@ -3,7 +3,6 @@ cc_binary { name: "resize2fs", host_supported: true, - defaults: ["e2fsprogs-defaults"], srcs: [ "extent.c", @@ -13,6 +12,7 @@ cc_binary { "sim_progress.c", "resource_track.c", ], + cflags: ["-W", "-Wall", "-Wno-macro-redefined"], shared_libs: [ "libext2fs", "libext2_com_err", |