1 files changed, 24 insertions, 8 deletions
diff --git a/pw_build_info/BUILD.gn b/pw_build_info/BUILD.gn
index 659a01ceb..10560d84d 100644
--- a/pw_build_info/BUILD.gn
+++ b/pw_build_info/BUILD.gn
@@ -16,6 +16,7 @@ import("//build_overrides/pigweed.gni")
 
 import("$dir_pw_build/target_types.gni")
 import("$dir_pw_docgen/docs.gni")
+import("$dir_pw_unit_test/test.gni")
 
 config("linker_script") {
   inputs = [ "build_id_linker_snippet.ld" ]
@@ -30,11 +31,11 @@ config("linker_script") {
     # default linker script instead of overriding it.
     ldflags = [
       "-T",
-      rebase_path("add_build_id_to_default_script.ld", root_build_dir),
+      rebase_path("add_build_id_to_default_linker_script.ld", root_build_dir),
     ]
     lib_dirs = [ "." ]
 
-    inputs += [ "add_build_id_to_default_script.ld" ]
+    inputs += [ "add_build_id_to_default_linker_script.ld" ]
   }
   visibility = [ ":*" ]
 }
@@ -56,17 +57,32 @@ if (current_os != "mac" && current_os != "win") {
       ":linker_script",
     ]
     public_configs = [ ":public_include_path" ]
-    cflags = [
-      "-Wno-array-bounds",
-      "-Wno-stringop-overflow",
-    ]
     public = [ "public/pw_build_info/build_id.h" ]
     sources = [ "build_id.cc" ]
-    deps = [ dir_pw_preprocessor ]
+    deps = [
+      dir_pw_preprocessor,
+      dir_pw_span,
+    ]
   }
 }
 
 pw_doc_group("docs") {
   sources = [ "docs.rst" ]
-  inputs = [ "build_id_linker_snippet.ld" ]
+  inputs = [
+    "add_build_id_to_default_linker_script.ld",
+    "build_id_linker_snippet.ld",
+  ]
+}
+
+pw_test_group("tests") {
+  tests = [ ":build_id_test" ]
+}
+
+pw_test("build_id_test") {
+  enable_if = current_os == "linux"
+  deps = [
+    ":build_id",
+    "$dir_pw_span",
+  ]
+  sources = [ "build_id_test.cc" ]
 }