From: Eric Biggers <ebiggers@google.com>
Date: Thu, 2 Feb 2023 17:56:20 +0000 (+0000)
Subject: AOSP: Revert "Android: stop suppressing warnings from macOS build"
X-Git-Tag: v1.47.1-wc1~120
X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=048424fdc056bb2b6bcd027e630cc68115a5922e;p=tools%2Fe2fsprogs.git

AOSP: Revert "Android: stop suppressing warnings from macOS build"

Unfortunately, the macOS build is not tested either by presubmit or by
local builds.  A macOS build *is* being tested in the upstream GitHub
Actions workflow now; however, that uses the autotools-based build
system, and there can be issues specific to the Android build system.

As a result, removing -Wno-error was not safe yet, and the macOS build
is currently broken in postsubmit.  As there could be multiple issues,
let's restore -Wno-error until I've had a chance to fix the warnings.

Bug: 267448785
Change-Id: I305f73d1f8637477da3d57b6c93037a6e3d9e829
From AOSP commit: 0ed82a3f0a393605b56672704379f4fc1e53d281
---

diff --git a/Android.bp b/Android.bp
index 1e6aa1a..9e229dd 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"],
         },