diff options
| author | Elliott Hughes <enh@google.com> | 2018-08-27 12:11:07 -0700 |
|---|---|---|
| committer | Elliott Hughes <enh@google.com> | 2018-08-27 12:11:43 -0700 |
| commit | 5f5a8863b7613130ed81b1a203f8e22815a193a6 (patch) | |
| tree | c3994f067f3c22e6ba423b1a54346f1f66ee2cc9 /ext4_utils | |
| parent | 99b46a5c74be622dbad5ab9eee75bb19219ba506 (diff) | |
| download | extras-5f5a8863b7613130ed81b1a203f8e22815a193a6.tar.gz | |
Clean up the global -Wno- in system/extras.
Bug: N/A
Test: builds
Change-Id: Idde3d0dafba08ffcd12cc9aa3540550e2601a227
Diffstat (limited to 'ext4_utils')
| -rw-r--r-- | ext4_utils/Android.bp | 3 | ||||
| -rw-r--r-- | ext4_utils/ext4_crypt_init_extensions.cpp | 1 | ||||
| -rw-r--r-- | ext4_utils/ext4_utils.c | 2 | ||||
| -rw-r--r-- | ext4_utils/wipe.c | 2 |
4 files changed, 3 insertions, 5 deletions
diff --git a/ext4_utils/Android.bp b/ext4_utils/Android.bp index e7d5a8e4..ead4d4d9 100644 --- a/ext4_utils/Android.bp +++ b/ext4_utils/Android.bp @@ -2,7 +2,6 @@ cc_library { name: "libext4_utils", - defaults: ["system-extras-cflags-defaults"], host_supported: true, recovery_available: true, srcs: [ @@ -11,7 +10,7 @@ cc_library { "ext4_sb.c", ], // Various instances of dereferencing a type-punned pointer in extent.c - cflags: ["-fno-strict-aliasing"], + cflags: ["-Werror", "-fno-strict-aliasing"], export_include_dirs: ["include"], shared_libs: [ "libsparse", diff --git a/ext4_utils/ext4_crypt_init_extensions.cpp b/ext4_utils/ext4_crypt_init_extensions.cpp index 52030fa8..c067bb91 100644 --- a/ext4_utils/ext4_crypt_init_extensions.cpp +++ b/ext4_utils/ext4_crypt_init_extensions.cpp @@ -39,7 +39,6 @@ #define TAG "ext4_utils" static const std::string arbitrary_sequence_number = "42"; -static const int vold_command_timeout_ms = 60 * 1000; static int set_system_de_policy_on(char const* dir); diff --git a/ext4_utils/ext4_utils.c b/ext4_utils/ext4_utils.c index 7be28537..04e2b6d9 100644 --- a/ext4_utils/ext4_utils.c +++ b/ext4_utils/ext4_utils.c @@ -221,7 +221,7 @@ u64 get_block_device_size(int fd) return size; } -int is_block_device_fd(int fd) +int is_block_device_fd(int fd __attribute__((unused))) { #ifdef _WIN32 return 0; diff --git a/ext4_utils/wipe.c b/ext4_utils/wipe.c index a519d743..7bda71c1 100644 --- a/ext4_utils/wipe.c +++ b/ext4_utils/wipe.c @@ -68,7 +68,7 @@ int wipe_block_device(int fd, s64 len) #else /* WIPE_IS_SUPPORTED */ -int wipe_block_device(int fd, s64 len) +int wipe_block_device(int fd __attribute__((unused)), s64 len __attribute__((unused))) { /* Wiping is not supported on this platform. */ return 1; |