aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTreehugger Robot <treehugger-gerrit@google.com>2023-02-09 05:56:48 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-02-09 05:56:48 +0000
commitb8f6b98cf507c4064b0e5f98baca9ad753e97185 (patch)
tree53bc7ef43956bc13deb681ee4121f3b81bedc6ea
parent582601c27d6dee62b741e78dcc77ab6707b43f10 (diff)
parent122f5e80879dfb0538fad846fc527408ee7c7bad (diff)
downloade2fsprogs-b8f6b98cf507c4064b0e5f98baca9ad753e97185.tar.gz
Merge "Mostly restore -Werror for macOS build" am: 8e81aecd53 am: e43a77cd1a am: 122f5e8087
Original change: https://android-review.googlesource.com/c/platform/external/e2fsprogs/+/2427203 Change-Id: If6ff4d503c35aa2ba83f19d35249379c0f7215fd Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--Android.bp4
1 files changed, 2 insertions, 2 deletions
diff --git a/Android.bp b/Android.bp
index 9e229dda..46f63348 100644
--- a/Android.bp
+++ b/Android.bp
@@ -63,8 +63,8 @@ cc_defaults {
],
},
darwin: {
- // Still has unfixed/unsuppressed warnings.
- cflags: ["-Wno-error"],
+ // This matches what the upstream CI uses
+ cflags: ["-Wno-error=deprecated-declarations"],
},
windows: {
include_dirs: ["external/e2fsprogs/include/mingw"],