From 64ded5527ae72c553327ee219d6cfcc14f436492 Mon Sep 17 00:00:00 2001
From: Eric Biggers <ebiggers@google.com>
Date: Wed, 8 Feb 2023 21:42:02 +0000
Subject: [PATCH] AOSP: Mostly restore -Werror for macOS build

It turns out the "Can't use getmntent or getmntinfo" warning was the
only warning remaining in the macOS build via the Android build system.
So now that it's fixed, -Wno-error can be removed.

That being said, the upstream CI (GitHub Actions) currently uses
-Wno-error=deprecated-declarations for the macOS build, since it's still
needed for some files (which aren't built by the Android build system).

For now, let's just replace -Wno-error with
-Wno-error=deprecated-declarations to match what the upstream CI uses.

Change-Id: I77f6649b99432ef1d73a0c7e30bbb150c3111b27
From AOSP commit: 6ea38ded59fe970704612a31a3aea4ccaf923d6a
---
 Android.bp | 4 ++--
 1 file 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"],