Rollback of 178106899.

PiperOrigin-RevId: 178384991

1 files changed, 4 insertions, 8 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/rules/nativedeps/NativeDepsHelper.java b/src/main/java/com/google/devtools/build/lib/rules/nativedeps/NativeDepsHelper.java
index 652f993625..a969aecad1 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/nativedeps/NativeDepsHelper.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/nativedeps/NativeDepsHelper.java
@@ -17,7 +17,6 @@ package com.google.devtools.build.lib.rules.nativedeps;
 import com.google.common.base.Preconditions;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.ImmutableSet;
 import com.google.devtools.build.lib.actions.Artifact;
 import com.google.devtools.build.lib.actions.Root;
 import com.google.devtools.build.lib.analysis.RuleContext;
@@ -27,7 +26,6 @@ import com.google.devtools.build.lib.collect.nestedset.NestedSet;
 import com.google.devtools.build.lib.rules.cpp.ArtifactCategory;
 import com.google.devtools.build.lib.rules.cpp.CcCommon;
 import com.google.devtools.build.lib.rules.cpp.CcLinkParams;
-import com.google.devtools.build.lib.rules.cpp.CcLinkParams.Linkstamp;
 import com.google.devtools.build.lib.rules.cpp.CcToolchainFeatures.FeatureConfiguration;
 import com.google.devtools.build.lib.rules.cpp.CcToolchainProvider;
 import com.google.devtools.build.lib.rules.cpp.CppBuildInfo;
@@ -49,6 +47,7 @@ import java.util.ArrayList;
 import java.util.Collection;
 import java.util.LinkedList;
 import java.util.List;
+import java.util.Map;
 
 /**
  * Helper class to create a dynamic library for rules which support integration with native code.
@@ -186,8 +185,8 @@ public abstract class NativeDepsHelper {
     List<String> linkopts = new ArrayList<>(extraLinkOpts);
     linkopts.addAll(linkParams.flattenedLinkopts());
 
-    CppHelper.checkLinkstampsUnique(ruleContext, linkParams);
-    ImmutableSet<Linkstamp> linkstamps = ImmutableSet.copyOf(linkParams.getLinkstamps());
+    Map<Artifact, NestedSet<Artifact>> linkstamps =
+        CppHelper.resolveLinkstamps(ruleContext, linkParams);
     List<Artifact> buildInfoArtifacts = linkstamps.isEmpty()
         ? ImmutableList.<Artifact>of()
         : ruleContext.getAnalysisEnvironment().getBuildInfo(
@@ -201,10 +200,7 @@ public abstract class NativeDepsHelper {
           getSharedNativeDepsPath(
               LinkerInputs.toLibraryArtifacts(linkerInputs),
               linkopts,
-              linkstamps
-                  .stream()
-                  .map(Linkstamp::getArtifact)
-                  .collect(ImmutableList.toImmutableList()),
+              linkstamps.keySet(),
               buildInfoArtifacts,
               ruleContext.getFeatures());
       libraryIdentifier = sharedPath.getPathString();