Address PR feedback

- Collect headers and transitive headers into a depset.
- Provide the headers depset to emit_compilepkg
- Add a compilation target that includes headers with transitive,
  relative include paths.

Author: patrickmscott

go/private/actions/archive.bzl

@@ -88,6 +88,11 @@ def emit_archive(go, source = None, _recompile_suffix = "", recompile_internal_d
     importmap = "main" if source.is_main else source.importmap
     importpath, _ = effective_importpath_pkgpath(source)
 
+    headers = depset(
+        direct = [f for f in source.srcs if f.path.split(".")[-1].lower().startswith("h")],
+        transitive = [a.data._headers for a in direct],
+    )
+
     if source.cgo and not go.mode.pure:
         # TODO(jayconrod): do we need to do full Bourne tokenization here?
         cppopts = [f for fs in source.cppopts for f in fs.split(" ")]
@@ -115,6 +120,7 @@ def emit_archive(go, source = None, _recompile_suffix = "", recompile_internal_d
             importpath = importpath,
             importmap = importmap,
             archives = direct,
+            headers = headers,
             out_lib = out_lib,
             out_export = out_export,
             out_facts = out_facts,
@@ -145,6 +151,7 @@ def emit_archive(go, source = None, _recompile_suffix = "", recompile_internal_d
             importpath = importpath,
             importmap = importmap,
             archives = direct,
+            headers = headers,
             out_lib = out_lib,
             out_export = out_export,
             out_facts = out_facts,
@@ -196,7 +203,7 @@ def emit_archive(go, source = None, _recompile_suffix = "", recompile_internal_d
         _validation_output = out_nogo_validation,
         _nogo_fix_output = out_nogo_fix,
         _cgo_deps = cgo_deps,
-        _headers = tuple([f for f in source.srcs if f.path.split(".")[-1].lower().startswith("h")]),
+        _headers = headers,
     )
     x_defs = dict(source.x_defs)
     for a in direct:

go/private/actions/compilepkg.bzl

@@ -57,6 +57,7 @@ def emit_compilepkg(
         importpath = "",
         importmap = "",
         archives = [],
+        headers = depset(),
         cgo = False,
         cgo_inputs = depset(),
         cppopts = [],
@@ -95,11 +96,9 @@ def emit_compilepkg(
         archives = archives + [go.coverdata]
 
     sdk = go.sdk
-    inputs_direct = sources + embedsrcs + [sdk.package_list]
-    for archive in archives:
-        inputs_direct.append(archive.data.export_file)
-        inputs_direct.extend(archive.data._headers)
-    inputs_transitive = [sdk.headers, sdk.tools, go.stdlib.libs]
+    inputs_direct = (sources + embedsrcs + [sdk.package_list] +
+                     [archive.data.export_file for archive in archives])
+    inputs_transitive = [sdk.headers, sdk.tools, go.stdlib.libs, headers]
     outputs = [out_lib, out_export]
 
     shared_args = go.builder_args(go, use_path_mapping = True)

tests/core/go_library/BUILD.bazel

@@ -28,10 +28,8 @@ go_library(
     srcs = [
         "inc.go",
         "inc_asmhdr.s",
-        "inc_relative.s",
     ],
     importpath = "asm_header",
-    deps = ["//tests/core/headers"],
 )
 
 go_library(

tests/core/go_library/inc_relative.s

@@ -0,0 +1,11 @@
+load("//go:def.bzl", "go_library")
+
+go_library(
+    name = "a",
+    srcs = [
+        "a.go",
+        "a.s",
+    ],
+    deps = ["//tests/core/transitive_headers/b"],
+    importpath = "github.com/bazelbuild/rules_go/tests/core/transitive_headers/a",
+)

tests/core/headers/BUILD.bazel

@@ -0,0 +1 @@
+package a

tests/core/headers/hdr.go

@@ -0,0 +1 @@
+#include "../b/b.h"

tests/core/transitive_headers/a/BUILD.bazel

@@ -0,0 +1,12 @@
+load("//go:def.bzl", "go_library")
+
+go_library(
+    name = "b",
+    srcs = [
+        "b.go",
+        "b.h",
+    ],
+    deps = ["//tests/core/transitive_headers/c"],
+    importpath = "github.com/bazelbuild/rules_go/tests/core/transitive_headers/b",
+    visibility = ["//visibility:public"],
+)