From 0a57d3dcb1cc014d65dbeb604035bb34a7191e29 Mon Sep 17 00:00:00 2001 From: jcater Date: Tue, 1 May 2018 20:33:18 -0700 Subject: Clean up code that directly imports nested classes like Builder, Entry, etc. PiperOrigin-RevId: 195040539 --- .../build/android/desugar/dependencies/MetadataCollector.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'src/tools/android/java/com/google/devtools/build/android/desugar/dependencies') diff --git a/src/tools/android/java/com/google/devtools/build/android/desugar/dependencies/MetadataCollector.java b/src/tools/android/java/com/google/devtools/build/android/desugar/dependencies/MetadataCollector.java index 732ef50721..448ccab023 100644 --- a/src/tools/android/java/com/google/devtools/build/android/desugar/dependencies/MetadataCollector.java +++ b/src/tools/android/java/com/google/devtools/build/android/desugar/dependencies/MetadataCollector.java @@ -22,7 +22,6 @@ import com.google.devtools.build.android.desugar.proto.DesugarDeps.Dependency; import com.google.devtools.build.android.desugar.proto.DesugarDeps.DesugarDepsInfo; import com.google.devtools.build.android.desugar.proto.DesugarDeps.InterfaceDetails; import com.google.devtools.build.android.desugar.proto.DesugarDeps.InterfaceWithCompanion; -import com.google.devtools.build.android.desugar.proto.DesugarDeps.Type; import javax.annotation.Nullable; /** Dependency collector that emits collected metadata as a {@link DesugarDepsInfo} proto. */ @@ -82,7 +81,7 @@ public final class MetadataCollector implements DependencyCollector { return DesugarDepsInfo.getDefaultInstance().equals(result) ? null : result.toByteArray(); } - private static Type wrapType(String internalName) { - return Type.newBuilder().setBinaryName(internalName).build(); + private static DesugarDeps.Type wrapType(String internalName) { + return DesugarDeps.Type.newBuilder().setBinaryName(internalName).build(); } } \ No newline at end of file -- cgit v1.2.3