diff options
author | 2018-08-06 03:05:29 -0700 | |
---|---|---|
committer | 2018-08-06 03:07:21 -0700 | |
commit | 7a3e39fc20f1fba810d8023ff1608e39f501492a (patch) | |
tree | 1b72979d65a670d0bd1c5b4aa459314a5e82e76b /src/main/java/com/google/devtools/build/lib/rules/java | |
parent | ad7b61286e29364d6c7e386f218c6c3b0530bfdc (diff) |
C++: Removes calls to setCcLinkparamsStore of CcLinkingInfo.Builder
This is in preparation for deleting CcLinkParamsStore. Not all calls to
setCcLinkparamsStore have been removed in this CL.
RELNOTES:none
PiperOrigin-RevId: 207516944
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/rules/java')
-rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/java/proto/JplCcLinkParams.java | 29 |
1 files changed, 12 insertions, 17 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/java/proto/JplCcLinkParams.java b/src/main/java/com/google/devtools/build/lib/rules/java/proto/JplCcLinkParams.java index 68f7222d46..09aeecc79c 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/java/proto/JplCcLinkParams.java +++ b/src/main/java/com/google/devtools/build/lib/rules/java/proto/JplCcLinkParams.java @@ -15,12 +15,10 @@ package com.google.devtools.build.lib.rules.java.proto; import com.google.common.collect.ImmutableList; +import com.google.devtools.build.lib.analysis.AnalysisUtils; import com.google.devtools.build.lib.analysis.RuleContext; import com.google.devtools.build.lib.analysis.TransitiveInfoCollection; import com.google.devtools.build.lib.analysis.configuredtargets.RuleConfiguredTarget; -import com.google.devtools.build.lib.rules.cpp.AbstractCcLinkParamsStore; -import com.google.devtools.build.lib.rules.cpp.CcLinkParams; -import com.google.devtools.build.lib.rules.cpp.CcLinkParamsStore; import com.google.devtools.build.lib.rules.cpp.CcLinkingInfo; import com.google.devtools.build.lib.rules.java.JavaCcLinkParamsProvider; import java.util.ArrayList; @@ -51,19 +49,16 @@ public class JplCcLinkParams { .getTransitiveInfoProviderMap() .getProvider(JavaCcLinkParamsProvider.class)); } - CcLinkingInfo.Builder builder = CcLinkingInfo.Builder.create(); - builder.setCcLinkParamsStore( - new CcLinkParamsStore( - new AbstractCcLinkParamsStore() { - @Override - protected void collect( - CcLinkParams.Builder builder, boolean linkingStatically, boolean linkShared) { - for (JavaCcLinkParamsProvider provider : providers) { - builder.add(provider.getCcLinkingInfo().getCcLinkParamsStore()); - } - builder.addTransitiveTargets(protoRuntimes); - } - })); - return new JavaCcLinkParamsProvider(builder.build()); + ImmutableList<CcLinkingInfo> ccLinkingInfos = + ImmutableList.<CcLinkingInfo>builder() + .addAll( + providers + .stream() + .map(JavaCcLinkParamsProvider::getCcLinkingInfo) + .collect(ImmutableList.toImmutableList())) + .addAll(AnalysisUtils.getProviders(protoRuntimes, CcLinkingInfo.PROVIDER)) + .build(); + + return new JavaCcLinkParamsProvider(CcLinkingInfo.merge(ccLinkingInfos)); } } |