From d61a185de8582d29dda7525bb04d8ffc5be3bd11 Mon Sep 17 00:00:00 2001
From: jcater <jcater@google.com>
Date: Wed, 2 May 2018 08:17:31 -0700
Subject: Clean up code that directly imports nested classes like Builder,
 Entry, etc.

PiperOrigin-RevId: 195094385
---
 .../devtools/build/lib/rules/cpp/LibrariesToLinkCollector.java       | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'src/main/java/com/google/devtools/build/lib/rules/cpp/LibrariesToLinkCollector.java')

diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/LibrariesToLinkCollector.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/LibrariesToLinkCollector.java
index dc7fb3bc6b..7685f32fb4 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/cpp/LibrariesToLinkCollector.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/LibrariesToLinkCollector.java
@@ -17,7 +17,6 @@ import com.google.common.base.Preconditions;
 import com.google.common.base.Strings;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.ImmutableSet.Builder;
 import com.google.common.collect.Iterables;
 import com.google.devtools.build.lib.actions.Artifact;
 import com.google.devtools.build.lib.rules.cpp.CcToolchainFeatures.FeatureConfiguration;
@@ -216,8 +215,8 @@ public class LibrariesToLinkCollector {
   }
 
   private Pair<Boolean, Boolean> addLinkerInputs(
-      Builder<String> librarySearchDirectories,
-      Builder<String> rpathEntries,
+      ImmutableSet.Builder<String> librarySearchDirectories,
+      ImmutableSet.Builder<String> rpathEntries,
       SequenceBuilder librariesToLink) {
     boolean includeSolibDir = false;
     boolean includeToolchainLibrariesSolibDir = false;
-- 
cgit v1.2.3