Clean up code that directly imports nested classes like Builder, Entry, etc.

PiperOrigin-RevId: 195100125

1 files changed, 6 insertions, 5 deletions

diff --git a/src/tools/android/java/com/google/devtools/build/android/GenerateRobolectricResourceSymbolsAction.java b/src/tools/android/java/com/google/devtools/build/android/GenerateRobolectricResourceSymbolsAction.java
index b859904daa..1df76b3f27 100644
--- a/src/tools/android/java/com/google/devtools/build/android/GenerateRobolectricResourceSymbolsAction.java
+++ b/src/tools/android/java/com/google/devtools/build/android/GenerateRobolectricResourceSymbolsAction.java
@@ -39,7 +39,6 @@ import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
 import java.util.Map;
-import java.util.Map.Entry;
 import java.util.concurrent.Callable;
 import java.util.concurrent.Executors;
 import java.util.concurrent.TimeUnit;
@@ -53,11 +52,12 @@ public class GenerateRobolectricResourceSymbolsAction {
       Logger.getLogger(GenerateRobolectricResourceSymbolsAction.class.getName());
 
   private static final class WriteLibraryRClass implements Callable<Boolean> {
-    private final Entry<String, Collection<ListenableFuture<ResourceSymbols>>> librarySymbolEntry;
+    private final Map.Entry<String, Collection<ListenableFuture<ResourceSymbols>>>
+        librarySymbolEntry;
     private final RClassGenerator generator;
 
     private WriteLibraryRClass(
-        Entry<String, Collection<ListenableFuture<ResourceSymbols>>> librarySymbolEntry,
+        Map.Entry<String, Collection<ListenableFuture<ResourceSymbols>>> librarySymbolEntry,
         RClassGenerator generator) {
       this.librarySymbolEntry = librarySymbolEntry;
       this.generator = generator;
@@ -185,8 +185,9 @@ public class GenerateRobolectricResourceSymbolsAction {
           libraries.add(library);
         }
         List<ListenableFuture<Boolean>> writeSymbolsTask = new ArrayList<>();
-        for (final Entry<String, Collection<ListenableFuture<ResourceSymbols>>> librarySymbolEntry :
-            ResourceSymbols.loadFrom(libraries, executorService, null).asMap().entrySet()) {
+        for (final Map.Entry<String, Collection<ListenableFuture<ResourceSymbols>>>
+            librarySymbolEntry :
+                ResourceSymbols.loadFrom(libraries, executorService, null).asMap().entrySet()) {
           writeSymbolsTask.add(
               executorService.submit(new WriteLibraryRClass(librarySymbolEntry, generator)));
         }