aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Biggers <ebiggers@google.com>2023-02-02 21:00:17 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-02-02 21:00:17 +0000
commit30bd2524ea3ed05e8fac8713ec610d035de5f9db (patch)
treebe995d80680bfc1aa89ca8c35157a25477eeab0e
parentf59fcd2d00ecd8864b610599743147a92907be3c (diff)
parent70ee9106c2ee09a59f1936c7d5c2ae12ed37ce61 (diff)
downloade2fsprogs-30bd2524ea3ed05e8fac8713ec610d035de5f9db.tar.gz
Merge "Revert "Android: stop suppressing warnings from macOS build"" am: 70ee9106c2
Original change: https://android-review.googlesource.com/c/platform/external/e2fsprogs/+/2419300 Change-Id: I36b3358ac3275b262e906b8c5aa31100c3abf88f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--Android.bp4
1 files changed, 4 insertions, 0 deletions
diff --git a/Android.bp b/Android.bp
index 1e6aa1a5..9e229dda 100644
--- a/Android.bp
+++ b/Android.bp
@@ -62,6 +62,10 @@ cc_defaults {
"libdl",
],
},
+ darwin: {
+ // Still has unfixed/unsuppressed warnings.
+ cflags: ["-Wno-error"],
+ },
windows: {
include_dirs: ["external/e2fsprogs/include/mingw"],
},