commit 036151f4168ed8bcb924a575a00febd09952d645
author Pierre-Clément Tosi <ptosi@google.com> Thu Oct 12 11:24:32 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Oct 12 11:24:32 2023 +0000
tree 884c32b5af45a4e0d5cee9b0a5c3402935e07e05
parent 29d6b4dbf5d4d72c863485658ed11724c8229b17
parent 206c37454abc6c57c3a175d1e1a99181638e553d

ANDROID: Use -Wno-macro-redefined for DTC tools am: 6c25e96cf6 am: bcf99873a6 am: 885653f48b am: 206c37454a

Original change: https://android-review.googlesource.com/c/platform/external/dtc/+/2784257

Change-Id: If7595ea8fed0508933473ee3d120af2f36e2341f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Android.bp

diff --git a/Android.bp b/Android.bp
index cb13748..a194eef 100644
--- a/Android.bp
+++ b/Android.bp
@@ -48,6 +48,7 @@
     cflags: [
         "-Wall",
         "-Werror",
+        "-Wno-macro-redefined",
         "-Wno-sign-compare",
         "-Wno-missing-field-initializers",
         "-Wno-unused-parameter",

BUILD.bazel

diff --git a/BUILD.bazel b/BUILD.bazel
index 439621d..5ef46e7 100644
--- a/BUILD.bazel
+++ b/BUILD.bazel
@@ -15,6 +15,7 @@
 COPTS = [
     "-Wall",
     "-Werror",
+    "-Wno-macro-redefined",
     "-Wno-sign-compare",
     "-Wno-missing-field-initializers",
     "-Wno-unused-parameter",