commit 51f90ce6cb124f7ed52636f133318d2866bde899
author Pierre-Clément Tosi <ptosi@google.com> Thu Oct 12 11:56:18 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Oct 12 11:56:18 2023 +0000
tree 884c32b5af45a4e0d5cee9b0a5c3402935e07e05
parent b5525c2a7d50d408311e66d9fa2dcaa2fb0eb45f
parent 036151f4168ed8bcb924a575a00febd09952d645

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

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

Change-Id: Ifcfc694b6703b0470f95b08c7716d33da4cc865e
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",