diff options
| author | Christopher Ferris <cferris@google.com> | 2017-02-23 15:36:54 -0800 |
|---|---|---|
| committer | Theodore Ts'o <tytso@mit.edu> | 2017-05-23 23:02:50 -0400 |
| commit | 1333f2b35fa4e2bd3da9ebdfff13b9ba0f9cbc08 (patch) | |
| tree | e0102c912b20a03ef3fdd1eb3f0b5185ee17a624 /contrib | |
| parent | 0c32f4899a837c7f4c3a421d0a8016d8f4e82224 (diff) | |
AOSP: Disable macro redefined warnings.
The new kernel headers do:
#define __bitwise __bitwise__
However, the code redefines __bitwise without undef'ing it first.
This is a temporary fix, b/35721782 filed to fix this.
Change-Id: I2c6a64146966f1737835f012d24ccc844570d02b
Test: Builds without warningers/errors.
From AOSP commit: commit 91581e8f15b8a29aedea3e7c11162301c7e66ec3
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/Android.bp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/contrib/Android.bp b/contrib/Android.bp index 585a8f13..c2d5cd91 100644 --- a/contrib/Android.bp +++ b/contrib/Android.bp @@ -10,7 +10,7 @@ cc_binary { host_supported: true, srcs: ["fsstress.c"], - cflags: ["-W", "-Wall"], + cflags: ["-W", "-Wall", "-Wno-macro-redefined"], system_shared_libs: ["libc"], target: { @@ -28,7 +28,7 @@ cc_binary { host_supported: true, srcs: ["add_ext4_encrypt.c"], - cflags: ["-W", "-Wall"], + cflags: ["-W", "-Wall", "-Wno-macro-redefined"], shared_libs: [ "libext2fs", "libext2_com_err", |