commit 905549aa5328b5b89b6ce9708a95e571683b7957
author plf <plf@google.com> Mon Nov 12 10:25:41 2018 -0800
committer Copybara-Service <copybara-piper@google.com> Mon Nov 12 10:27:40 2018 -0800
tree fcda674c5ea757a4deb8b83a7f47ca3d2055b0b4
parent d1893c0dda9afaf32f270f40780f7cac13de6fa8

C++: Makes .so and .ifso files have same path

They were generated by slightly different functions that added an extra
component to the path.

RELNOTES:none
PiperOrigin-RevId: 221114668

src/main/java/com/google/devtools/build/lib/rules/cpp/CcLinkingHelper.java

diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcLinkingHelper.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcLinkingHelper.java
index 8dcc658..667bb6a 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcLinkingHelper.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcLinkingHelper.java
@@ -643,13 +643,7 @@
     Artifact soInterface = null;
     if (CppHelper.useInterfaceSharedObjects(cppConfiguration, ccToolchain)
         && emitInterfaceSharedObjects) {
-      soInterface =
-          CppHelper.getLinkedArtifact(
-              ruleContext,
-              ccToolchain,
-              configuration,
-              LinkTargetType.INTERFACE_DYNAMIC_LIBRARY,
-              linkedArtifactNameSuffix);
+      soInterface = getLinkedArtifact(LinkTargetType.INTERFACE_DYNAMIC_LIBRARY);
       // TODO(b/28946988): Remove this hard-coded flag.
       if (!featureConfiguration.isEnabled(CppRuleClasses.TARGETS_WINDOWS)) {
         sonameLinkopts =