diff options
| author | Ivan Gavrilovic <gavra@google.com> | 2018-05-08 02:20:39 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-05-08 02:20:39 -0700 |
| commit | 6beb00b4744298d2ef28b6590c31b6848885b28d (patch) | |
| tree | 74deac1e16e97c2c13f226cd4635cd65abf19303 /test/java/com/google/devtools/build/android/desugar/dependencies/MetadataCollectorTest.java | |
| parent | a715adced42d392e01c985f0585d8a313f76f1b8 (diff) | |
| parent | 9d2aa110047c892318c506d8ca5db6e7e14f9189 (diff) | |
| download | desugar-6beb00b4744298d2ef28b6590c31b6848885b28d.tar.gz | |
Merge remote-tracking branch upstream-master into master
am: 9d2aa11004
Change-Id: Idc6b70ef72f260b65d9bb7b126f2af059a53e906
Diffstat (limited to 'test/java/com/google/devtools/build/android/desugar/dependencies/MetadataCollectorTest.java')
| -rw-r--r-- | test/java/com/google/devtools/build/android/desugar/dependencies/MetadataCollectorTest.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/test/java/com/google/devtools/build/android/desugar/dependencies/MetadataCollectorTest.java b/test/java/com/google/devtools/build/android/desugar/dependencies/MetadataCollectorTest.java index e99abc4..64dd871 100644 --- a/test/java/com/google/devtools/build/android/desugar/dependencies/MetadataCollectorTest.java +++ b/test/java/com/google/devtools/build/android/desugar/dependencies/MetadataCollectorTest.java @@ -16,11 +16,11 @@ package com.google.devtools.build.android.desugar.dependencies; import static com.google.common.truth.Truth.assertThat; import com.google.common.collect.ImmutableList; +import com.google.devtools.build.android.desugar.proto.DesugarDeps; 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 org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.JUnit4; @@ -103,8 +103,8 @@ public class MetadataCollectorTest { .build()); } - private static Type wrapType(String name) { - return Type.newBuilder().setBinaryName(name).build(); + private static DesugarDeps.Type wrapType(String name) { + return DesugarDeps.Type.newBuilder().setBinaryName(name).build(); } private DesugarDepsInfo extractProto(MetadataCollector collector) throws Exception { |