aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Biggers <ebiggers@google.com>2023-02-02 21:32:23 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-02-02 21:32:23 +0000
commit2e0c074495204db4c4c2b13c41a8cd50868b6a69 (patch)
treebe995d80680bfc1aa89ca8c35157a25477eeab0e
parent22c7ef59d5277f583f48f2f50d3a91c4f8d70755 (diff)
parent30bd2524ea3ed05e8fac8713ec610d035de5f9db (diff)
downloade2fsprogs-2e0c074495204db4c4c2b13c41a8cd50868b6a69.tar.gz
Merge "Revert "Android: stop suppressing warnings from macOS build"" am: 70ee9106c2 am: 30bd2524ea
Original change: https://android-review.googlesource.com/c/platform/external/e2fsprogs/+/2419300 Change-Id: Iec94dac79be23357a4db8843f899475281ed3e75 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"],
},