aboutsummaryrefslogtreecommitdiff
path: root/resize
diff options
context:
space:
mode:
authorChristopher Ferris <cferris@google.com>2017-02-23 15:36:54 -0800
committerTheodore Ts'o <tytso@mit.edu>2017-05-23 23:02:50 -0400
commit1333f2b35fa4e2bd3da9ebdfff13b9ba0f9cbc08 (patch)
treee0102c912b20a03ef3fdd1eb3f0b5185ee17a624 /resize
parent0c32f4899a837c7f4c3a421d0a8016d8f4e82224 (diff)
downloade2fsprogs-1333f2b35fa4e2bd3da9ebdfff13b9ba0f9cbc08.tar.gz
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 'resize')
-rw-r--r--resize/Android.bp2
1 files changed, 1 insertions, 1 deletions
diff --git a/resize/Android.bp b/resize/Android.bp
index 5d8f0e8b..6d3d3217 100644
--- a/resize/Android.bp
+++ b/resize/Android.bp
@@ -12,7 +12,7 @@ cc_binary {
"sim_progress.c",
"resource_track.c",
],
- cflags: ["-W", "-Wall"],
+ cflags: ["-W", "-Wall", "-Wno-macro-redefined"],
shared_libs: [
"libext2fs",
"libext2_com_err",