diff options
| author |  jcater <jcater@google.com> | 2018-05-02 08:17:31 -0700 |
|---|---|---|
| committer |  Copybara-Service <copybara-piper@google.com> | 2018-05-02 08:18:51 -0700 |
| commit | d61a185de8582d29dda7525bb04d8ffc5be3bd11 (patch) | |
| tree | 56c94776bceaa11ee55af9fce5a1307e71a22a70 /src/main/java/com/google/devtools/build/lib/rules/cpp/LibrariesToLinkCollector.java | |
| parent | 9f2b052d93bfd188687f28fe6771f390d3626936 (diff) | |
Clean up code that directly imports nested classes like Builder, Entry, etc.
PiperOrigin-RevId: 195094385
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/rules/cpp/LibrariesToLinkCollector.java')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/cpp/LibrariesToLinkCollector.java | 5 |
1 files changed, 2 insertions, 3 deletions
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; |