Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[6.4.0] cc_library: propagate data dependencies via implementation_deps. #19590

Merged
merged 3 commits into from
Sep 25, 2023
Merged

[6.4.0] cc_library: propagate data dependencies via implementation_deps. #19590

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4356040
cc_library: propagate data dependencies via implementation_deps.
quval Jun 1, 2023
37ab338
Merge branch 'release-6.4.0' into cc-implementation-deps-runfiles
iancha1992 Sep 22, 2023
1f8e946
Merge branch 'release-6.4.0' into cc-implementation-deps-runfiles
meteorcloudy Sep 25, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions src/main/starlark/builtins_bzl/common/cc/cc_library.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -283,6 +283,9 @@ def _cc_library_impl(ctx):
for dep in ctx.attr.deps:
runfiles_list.append(dep[DefaultInfo].default_runfiles)

for dep in ctx.attr.implementation_deps:
runfiles_list.append(dep[DefaultInfo].default_runfiles)

runfiles = ctx.runfiles().merge_all(runfiles_list)

default_runfiles = ctx.runfiles(files = cc_helper.get_dynamic_libraries_for_runtime(linking_context_for_runfiles, True))
Expand Down
38 changes: 38 additions & 0 deletions src/test/java/com/google/devtools/build/lib/rules/cpp/CcLibraryConfiguredTargetTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2004,6 +2004,44 @@ public void testImplementationDepsLinkingContextIsPropagated() throws Exception
.contains("bin foo/libimplementation_dep.a");
}

@Test
public void testImplementationDepsRunfilesArePropagated() throws Exception {
useConfiguration("--experimental_cc_implementation_deps");
scratch.file(
"foo/BUILD",
"cc_binary(",
" name = 'bin',",
" srcs = ['bin.cc'],",
" deps = ['lib'],",
")",
"cc_library(",
" name = 'lib',",
" srcs = ['lib.cc'],",
" deps = ['public_dep'],",
")",
"cc_library(",
" name = 'public_dep',",
" srcs = ['public_dep.cc'],",
" hdrs = ['public_dep.h'],",
" implementation_deps = ['implementation_dep'],",
" deps = ['interface_dep'],",
")",
"cc_library(",
" name = 'interface_dep',",
" data = ['data/interface.txt'],",
")",
"cc_library(",
" name = 'implementation_dep',",
" data = ['data/implementation.txt'],",
")");

ConfiguredTarget lib = getConfiguredTarget("//foo:bin");
assertThat(
artifactsToStrings(
lib.get(DefaultInfo.PROVIDER).getDefaultRunfiles().getAllArtifacts()))
.containsAtLeast("src foo/data/interface.txt", "src foo/data/implementation.txt");
}

@Test
public void testImplementationDepsConfigurationHostSucceeds() throws Exception {
useConfiguration("--experimental_cc_implementation_deps");
Expand Down