1 files changed, 20 insertions, 20 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcImport.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcImport.java
index 373d2d5747..45969ba592 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcImport.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcImport.java
@@ -119,44 +119,44 @@ public abstract class CcImport implements RuleConfiguredTargetFactory {
     // Now we are going to have some platform dependent behaviors
     boolean targetWindows = featureConfiguration.isEnabled(CppRuleClasses.TARGETS_WINDOWS);
 
-    Iterable<LibraryToLink> dynamicLibraryList = null;
-    Iterable<LibraryToLink> executionDynamicLibraryList = null;
+    Iterable<LibraryToLink> dynamicLibraryForLinkingList = null;
+    Iterable<LibraryToLink> dynamicLibrariesForRuntimeList = null;
     if (sharedLibrary != null) {
       if (targetWindows) {
-        executionDynamicLibraryList =
+        dynamicLibrariesForRuntimeList =
             ImmutableList.of(
                 LinkerInputs.opaqueLibraryToLink(
                     sharedLibrary, ArtifactCategory.DYNAMIC_LIBRARY, libraryIdentifier));
       } else {
-        executionDynamicLibraryList =
-                ImmutableList.of(
-                    LinkerInputs.solibLibraryToLink(
-                        common.getDynamicLibrarySymlink(sharedLibrary, true),
-                        sharedLibrary,
-                        libraryIdentifier));
+        dynamicLibrariesForRuntimeList =
+            ImmutableList.of(
+                LinkerInputs.solibLibraryToLink(
+                    common.getDynamicLibrarySymlink(sharedLibrary, true),
+                    sharedLibrary,
+                    libraryIdentifier));
       }
-      linkingHelper.addExecutionDynamicLibraries(executionDynamicLibraryList);
+      linkingHelper.addDynamicLibrariesForRuntime(dynamicLibrariesForRuntimeList);
     }
 
     if (interfaceLibrary != null) {
       if (targetWindows) {
-        dynamicLibraryList =
+        dynamicLibraryForLinkingList =
             ImmutableList.of(
                 LinkerInputs.opaqueLibraryToLink(
                     interfaceLibrary, ArtifactCategory.INTERFACE_LIBRARY, libraryIdentifier));
       } else {
-        dynamicLibraryList =
-                ImmutableList.of(
-                    LinkerInputs.solibLibraryToLink(
-                        common.getDynamicLibrarySymlink(interfaceLibrary, true),
-                        interfaceLibrary,
-                        libraryIdentifier));
+        dynamicLibraryForLinkingList =
+            ImmutableList.of(
+                LinkerInputs.solibLibraryToLink(
+                    common.getDynamicLibrarySymlink(interfaceLibrary, true),
+                    interfaceLibrary,
+                    libraryIdentifier));
       }
     } else {
       // If interface_library is not specified and we are not building for Windows, then the dynamic
       // library required at linking time is the same as the one required at execution time.
       if (!targetWindows) {
-        dynamicLibraryList = executionDynamicLibraryList;
+        dynamicLibraryForLinkingList = dynamicLibrariesForRuntimeList;
       } else if (staticLibrary == null) {
         ruleContext.ruleError(
           "'interface library' must be specified when using cc_import for shared library on"
@@ -164,8 +164,8 @@ public abstract class CcImport implements RuleConfiguredTargetFactory {
       }
     }
 
-    if (dynamicLibraryList != null) {
-      linkingHelper.addDynamicLibraries(dynamicLibraryList);
+    if (dynamicLibraryForLinkingList != null) {
+      linkingHelper.addDynamicLibrariesForLinking(dynamicLibraryForLinkingList);
     }
 
     LinkingInfo linkingInfo =