From: Chih-Hung Hsieh <chh@google.com>
Date: Wed, 27 Sep 2017 18:12:30 +0000 (-0700)
Subject: AOSP: Add e2fsprogs-defaults cc_defaults
X-Git-Tag: v1.44.0-rc1~15
X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=afaa199228233b453284a70ca9d2adab7ab9b323;p=tools%2Fe2fsprogs.git

AOSP: Add e2fsprogs-defaults cc_defaults

This is the result of two commits:

AOSP: Use -Werror in external/e2fsprogs
AOSP: Revert "Use -Werror in external/e2fsprogs"

... where the second wasn't quite an exact revert of the first.
Sigh.

Change-Id: I3842bd72cdb24ca51a0a42685a33a0ce082f9c77
From AOSP commit: 2002d7f1fca44300198d7eee8503e015e4d4682e

Change-Id: I16e52d4088c5b85dd23de519cb5af8aefeef85e6
From AOSP commit: ec02acfd8576df4bd0779c9f88f32e02355c5d2c
---

diff --git a/Android.bp b/Android.bp
index a095aea..8e44ba7 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,5 +1,17 @@
 // Copyright 2017 The Android Open Source Project
 
+cc_defaults {
+    name: "e2fsprogs-defaults",
+    clang_cflags: ["-Wno-error=macro-redefined"],
+    cflags: ["-Wall", "-Werror"],
+    target: {
+        darwin: {
+            // Still has unfixed/unsuppressed warnings.
+            cflags: ["-Wno-error"],
+        },
+    },
+}
+
 subdirs = [
     "contrib",
     "debugfs",