Merge "Mostly restore -Werror for macOS build"
diff --git a/Android.bp b/Android.bp
index 9e229dd..46f6334 100644
--- a/Android.bp
+++ b/Android.bp
@@ -63,8 +63,8 @@
             ],
         },
         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"],