diff options
author | plf <plf@google.com> | 2018-07-16 07:19:33 -0700 |
---|---|---|
committer | Copybara-Service <copybara-piper@google.com> | 2018-07-16 07:21:37 -0700 |
commit | 020ac7ef02f4de0a85d73737e4316c5fc778f97e (patch) | |
tree | 5385a3d2bef707d9adde53ab28968b12e62f74cb /src/test/java/com/google/devtools/build/lib/rules | |
parent | 1281a024b2b0bfeed2015e2257e0a170a703df08 (diff) |
C++: Remove CcDynamicLibrariesForRuntime.
This was providing runtime libraries. This provider is redundant because the
same libraries are in CcLinkParamsStore.
Note to sheriff: Shouldn't break anything. If any, breakages would most likely be in Go test rules. I will look at the nightly tomorrow anyway. The breakages in the linked TGP re-run are not caused by this change, later re-runs have unrelated changes.
TESTED=[]
RELNOTES:none
PiperOrigin-RevId: 204738136
Diffstat (limited to 'src/test/java/com/google/devtools/build/lib/rules')
3 files changed, 15 insertions, 10 deletions
diff --git a/src/test/java/com/google/devtools/build/lib/rules/cpp/CcCommonTest.java b/src/test/java/com/google/devtools/build/lib/rules/cpp/CcCommonTest.java index 49b14ea565..580c4e7f7e 100644 --- a/src/test/java/com/google/devtools/build/lib/rules/cpp/CcCommonTest.java +++ b/src/test/java/com/google/devtools/build/lib/rules/cpp/CcCommonTest.java @@ -119,8 +119,9 @@ public class CcCommonTest extends BuildViewTestCase { assertThat( emptylib .get(CcLinkingInfo.PROVIDER) - .getCcDynamicLibrariesForRuntime() - .getDynamicLibrariesForRuntimeArtifacts() + .getCcLinkParamsStore() + .get(/* linkingStatically= */ false, /* linkShared= */ false) + .getDynamicLibrariesForRuntime() .isEmpty()) .isTrue(); } @@ -232,8 +233,9 @@ public class CcCommonTest extends BuildViewTestCase { assertThat( statically .get(CcLinkingInfo.PROVIDER) - .getCcDynamicLibrariesForRuntime() - .getDynamicLibrariesForRuntimeArtifacts() + .getCcLinkParamsStore() + .get(/* linkingStatically= */ false, /* linkShared= */ false) + .getDynamicLibrariesForRuntime() .isEmpty()) .isTrue(); Artifact staticallyDotA = getOnlyElement(getFilesToBuild(statically)); diff --git a/src/test/java/com/google/devtools/build/lib/rules/cpp/CcLibraryConfiguredTargetTest.java b/src/test/java/com/google/devtools/build/lib/rules/cpp/CcLibraryConfiguredTargetTest.java index 6b128f17fb..b3c23cd370 100644 --- a/src/test/java/com/google/devtools/build/lib/rules/cpp/CcLibraryConfiguredTargetTest.java +++ b/src/test/java/com/google/devtools/build/lib/rules/cpp/CcLibraryConfiguredTargetTest.java @@ -219,8 +219,9 @@ public class CcLibraryConfiguredTargetTest extends BuildViewTestCase { assertThat( hello .get(CcLinkingInfo.PROVIDER) - .getCcDynamicLibrariesForRuntime() - .getDynamicLibrariesForRuntimeArtifacts()) + .getCcLinkParamsStore() + .get(/* linkingStatically= */ false, /* linkShared= */ false) + .getDynamicLibrariesForRuntime()) .containsExactly(implSharedObjectLink); } @@ -284,8 +285,9 @@ public class CcLibraryConfiguredTargetTest extends BuildViewTestCase { assertThat( hello .get(CcLinkingInfo.PROVIDER) - .getCcDynamicLibrariesForRuntime() - .getDynamicLibrariesForRuntimeArtifacts()) + .getCcLinkParamsStore() + .get(/* linkingStatically= */ false, /* linkShared= */ false) + .getDynamicLibrariesForRuntime()) .containsExactly(implSharedObjectLink); } diff --git a/src/test/java/com/google/devtools/build/lib/rules/cpp/LibraryLinkingTest.java b/src/test/java/com/google/devtools/build/lib/rules/cpp/LibraryLinkingTest.java index 6a98bc478c..130c5ff8db 100644 --- a/src/test/java/com/google/devtools/build/lib/rules/cpp/LibraryLinkingTest.java +++ b/src/test/java/com/google/devtools/build/lib/rules/cpp/LibraryLinkingTest.java @@ -111,8 +111,9 @@ public final class LibraryLinkingTest extends BuildViewTestCase { Iterables.getOnlyElement( ccLib .get(CcLinkingInfo.PROVIDER) - .getCcDynamicLibrariesForRuntime() - .getDynamicLibrariesForRuntimeArtifacts()); + .getCcLinkParamsStore() + .get(/* linkingStatically= */ false, /* linkShared= */ false) + .getDynamicLibrariesForRuntime()); // This artifact is generated by a SolibSymlinkAction, so we need to go back two levels. CppLinkAction solibLink = (CppLinkAction) getGeneratingAction(getGeneratingAction(soLib).getPrimaryInput()); |