commit 7a55909ac60d1b43563c74d7e16aea2b895f0367
author Pierre-Clément Tosi <ptosi@google.com> Thu Oct 12 10:51:27 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Oct 12 10:51:27 2023 +0000
tree 8a40c4f9b84fa7cd74ca92be31880cb7da83edb2
parent 206c37454abc6c57c3a175d1e1a99181638e553d
parent 98f5673dc61f8b80def876aee73b054fef03dd85

ANDROID: Use -Wall and more when building libfdt am: 170bf1d4ce am: 350d496637 am: 98f5673dc6

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

Change-Id: Ic1326085efd754b8c03e79170c50740e70a4c1f4
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 a194eef..85c1b22 100644
--- a/Android.bp
+++ b/Android.bp
@@ -44,14 +44,21 @@
 }
 
 cc_defaults {
-    name: "dt_defaults",
+    name: "dtc_cflags_defaults",
     cflags: [
         "-Wall",
         "-Werror",
         "-Wno-macro-redefined",
-        "-Wno-sign-compare",
         "-Wno-missing-field-initializers",
+        "-Wno-sign-compare",
         "-Wno-unused-parameter",
+    ],
+}
+
+cc_defaults {
+    name: "dt_defaults",
+    defaults: ["dtc_cflags_defaults"],
+    cflags: [
         "-DNO_YAML"
     ],
 

BUILD.bazel

diff --git a/BUILD.bazel b/BUILD.bazel
index 5ef46e7..d9fdb9a 100644
--- a/BUILD.bazel
+++ b/BUILD.bazel
@@ -1,26 +1,22 @@
+COPTS = [
+    "-Wall",
+    "-Werror",
+    "-Wno-macro-redefined",
+    "-Wno-missing-field-initializers",
+    "-Wno-sign-compare",
+    "-Wno-unused-parameter",
+]
+
 cc_library(
     name = "libfdt",
     srcs = glob([
         "libfdt/*.h",
         "libfdt/*.c",
     ]),
-    copts = [
-        "-Werror",
-        "-Wno-macro-redefined",
-        "-Wno-sign-compare",
-    ],
+    copts = COPTS,
     includes = ["libfdt"],
 )
 
-COPTS = [
-    "-Wall",
-    "-Werror",
-    "-Wno-macro-redefined",
-    "-Wno-sign-compare",
-    "-Wno-missing-field-initializers",
-    "-Wno-unused-parameter",
-]
-
 genrule(
     name = "lexer",
     srcs = [

libfdt/Android.bp

diff --git a/libfdt/Android.bp b/libfdt/Android.bp
index 8f4bdfd..0bf631a 100644
--- a/libfdt/Android.bp
+++ b/libfdt/Android.bp
@@ -7,12 +7,7 @@
 cc_library {
     name: "libfdt",
     host_supported: true,
-
-    cflags: [
-        "-Werror",
-        "-Wno-macro-redefined",
-        "-Wno-sign-compare",
-    ],
+    defaults: ["dtc_cflags_defaults"],
     srcs: [
         "fdt.c",
         "fdt_check.c",