Fix bug in cc_shared_library and cc_binary runfiles

oquenchil · copybara-github · commit 5ad403bf98f0 · 2022-03-02T10:53:03.000-08:00
One bug was in cc_shared_library which was not adding the runfiles of
cc_libraries in roots.

The other was a regression in cc_binary introduced in the rewrite from Java to
Starlark but wasn't caught by any tests.

RELNOTES:none
PiperOrigin-RevId: 431978572
diff --git a/src/main/starlark/builtins_bzl/common/cc/cc_binary.bzl b/src/main/starlark/builtins_bzl/common/cc/cc_binary.bzl
@@ -296,6 +296,9 @@ def _collect_runfiles(ctx, feature_configuration, cc_toolchain, libraries, cc_li
         runtime_objects_for_coverage.extend(_runfiles_function(ctx, transitive_info_collection, True).to_list())
         runtime_objects_for_coverage.extend(_runfiles_function(ctx, transitive_info_collection, False).to_list())
 
+    for dynamic_dep in ctx.attr.dynamic_deps:
+        builder = builder.merge(dynamic_dep[DefaultInfo].default_runfiles)
+
     builder = builder.merge_all(runfiles_is_static + runfiles_is_not_static)
     if linking_mode == _LINKING_DYNAMIC:
         dynamic_runtime_lib = cc_toolchain.dynamic_runtime_lib(feature_configuration = feature_configuration)
diff --git a/src/main/starlark/builtins_bzl/common/cc/experimental_cc_shared_library.bzl b/src/main/starlark/builtins_bzl/common/cc/experimental_cc_shared_library.bzl
@@ -498,6 +498,12 @@ def _cc_shared_library_impl(ctx):
         runfiles = runfiles.merge(dep[DefaultInfo].data_runfiles)
         transitive_debug_files.append(dep[OutputGroupInfo].rule_impl_debug_files)
 
+    precompiled_only_dynamic_libraries_runfiles = []
+    for precompiled_dynamic_library in precompiled_only_dynamic_libraries:
+        precompiled_only_dynamic_libraries_runfiles.append(precompiled_dynamic_library.dynamic_library)
+        if precompiled_dynamic_library.resolved_symlink_dynamic_library != None:
+            precompiled_only_dynamic_libraries_runfiles.append(precompiled_dynamic_library.resolved_symlink_dynamic_library)
+
     for export in ctx.attr.roots:
         exports[str(export.label)] = True
 
diff --git a/src/main/starlark/tests/builtins_bzl/cc/cc_shared_library/test_cc_shared_library/BUILD.builtin_test b/src/main/starlark/tests/builtins_bzl/cc/cc_shared_library/test_cc_shared_library/BUILD.builtin_test
@@ -1,4 +1,4 @@
-load(":starlark_tests.bzl", "additional_inputs_test", "build_failure_test", "debug_files_test", "linking_suffix_test", "paths_test")
+load(":starlark_tests.bzl", "additional_inputs_test", "build_failure_test", "debug_files_test", "linking_suffix_test", "paths_test", "runfiles_test")
 
 LINKABLE_MORE_THAN_ONCE = "LINKABLE_MORE_THAN_ONCE"
 
@@ -369,6 +369,14 @@ debug_files_test(
     target_under_test = ":binary",
 )
 
+runfiles_test(
+    name = "runfiles_test",
+    target_under_test = ":binary",
+    is_linux = select({
+        "//src/conditions:linux": True,
+        "//conditions:default": False}),
+)
+
 build_failure_test(
     name = "static_deps_error_test",
     messages = select({
diff --git a/src/main/starlark/tests/builtins_bzl/cc/cc_shared_library/test_cc_shared_library/starlark_tests.bzl b/src/main/starlark/tests/builtins_bzl/cc/cc_shared_library/test_cc_shared_library/starlark_tests.bzl
@@ -146,3 +146,28 @@ def _debug_files_test_impl(ctx):
     return analysistest.end(env)
 
 debug_files_test = analysistest.make(_debug_files_test_impl)
+
+def _runfiles_test_impl(ctx):
+    env = analysistest.begin(ctx)
+    if not ctx.attr.is_linux:
+        return analysistest.end(env)
+
+    target_under_test = analysistest.target_under_test(env)
+    actual_files = []
+    for runfile in target_under_test[DefaultInfo].default_runfiles.files.to_list():
+        actual_files.append(runfile.basename)
+    expected = [
+        "libfoo_so.so",
+        "libbar_so.so",
+    ]
+    for expected_file in expected:
+        asserts.true(env, expected_file in actual_files, expected_file + " not found in actual files:\n" + "\n".join(actual_files))
+
+    return analysistest.end(env)
+
+runfiles_test = analysistest.make(
+    _runfiles_test_impl,
+    attrs = {
+        "is_linux": attr.bool(),
+    },
+)
