diff options
Diffstat (limited to 'src/tools')
5 files changed, 10 insertions, 16 deletions
diff --git a/src/tools/android/java/com/google/devtools/build/android/Converters.java b/src/tools/android/java/com/google/devtools/build/android/Converters.java index 13911f973e..5e89db254a 100644 --- a/src/tools/android/java/com/google/devtools/build/android/Converters.java +++ b/src/tools/android/java/com/google/devtools/build/android/Converters.java @@ -19,7 +19,6 @@ import com.android.manifmerger.ManifestMerger2.MergeType; import com.android.repository.Revision; import com.google.common.base.Splitter; import com.google.common.collect.ImmutableList; -import com.google.common.collect.ImmutableList.Builder; import com.google.common.collect.ImmutableMap; import com.google.devtools.build.android.aapt2.CompiledResources; import com.google.devtools.build.android.aapt2.StaticLibrary; @@ -423,7 +422,7 @@ public final class Converters { @Override public List<StaticLibrary> convert(String input) throws OptionsParsingException { - final Builder<StaticLibrary> builder = ImmutableList.<StaticLibrary>builder(); + final ImmutableList.Builder<StaticLibrary> builder = ImmutableList.<StaticLibrary>builder(); for (String path : SPLITTER.splitToList(input)) { builder.add(libraryConverter.convert(path)); } diff --git a/src/tools/android/java/com/google/devtools/build/android/FullyQualifiedName.java b/src/tools/android/java/com/google/devtools/build/android/FullyQualifiedName.java index 077b51f17f..e8f6ee3ada 100644 --- a/src/tools/android/java/com/google/devtools/build/android/FullyQualifiedName.java +++ b/src/tools/android/java/com/google/devtools/build/android/FullyQualifiedName.java @@ -24,7 +24,6 @@ import com.google.common.base.Joiner; import com.google.common.base.MoreObjects; import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableList; -import com.google.common.collect.ImmutableList.Builder; import com.google.common.collect.Iterators; import com.google.common.collect.PeekingIterator; import com.google.devtools.build.android.proto.SerializeFormat; @@ -561,7 +560,7 @@ public class FullyQualifiedName implements DataKey { // This is fragile but better than the Gradle scheme of just dropping // entire subtrees. - Builder<String> builder = ImmutableList.<String>builder(); + ImmutableList.Builder<String> builder = ImmutableList.<String>builder(); addIfNotNull(config.getCountryCodeQualifier(), builder); addIfNotNull(config.getNetworkCodeQualifier(), builder); if (transformedLocaleQualifiers.isEmpty()) { diff --git a/src/tools/android/java/com/google/devtools/build/android/aapt2/ResourceCompiler.java b/src/tools/android/java/com/google/devtools/build/android/aapt2/ResourceCompiler.java index b845536e21..d7a3805874 100644 --- a/src/tools/android/java/com/google/devtools/build/android/aapt2/ResourceCompiler.java +++ b/src/tools/android/java/com/google/devtools/build/android/aapt2/ResourceCompiler.java @@ -19,7 +19,6 @@ import com.android.builder.core.VariantType; import com.android.repository.Revision; import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableList; -import com.google.common.collect.ImmutableList.Builder; import com.google.common.util.concurrent.ListenableFuture; import com.google.common.util.concurrent.ListeningExecutorService; import com.google.devtools.build.android.AaptCommandBuilder; @@ -273,7 +272,7 @@ public class ResourceCompiler { } List<Path> getCompiledArtifacts() { - Builder<Path> builder = ImmutableList.builder(); + ImmutableList.Builder<Path> builder = ImmutableList.builder(); List<Throwable> compilationErrors = new ArrayList<>(); for (ListenableFuture<List<Path>> task : tasks) { try { diff --git a/src/tools/android/java/com/google/devtools/build/android/xml/AttrXmlResourceValue.java b/src/tools/android/java/com/google/devtools/build/android/xml/AttrXmlResourceValue.java index f2645ac0a3..4fc53e173a 100644 --- a/src/tools/android/java/com/google/devtools/build/android/xml/AttrXmlResourceValue.java +++ b/src/tools/android/java/com/google/devtools/build/android/xml/AttrXmlResourceValue.java @@ -26,7 +26,6 @@ import com.google.common.base.Preconditions; import com.google.common.collect.FluentIterable; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; -import com.google.common.collect.ImmutableMap.Builder; import com.google.common.collect.Ordering; import com.google.devtools.build.android.AndroidDataWritingVisitor; import com.google.devtools.build.android.AndroidDataWritingVisitor.StartTag; @@ -99,7 +98,7 @@ public class AttrXmlResourceValue implements XmlResourceValue { private static Map<String, String> readSubValues(XMLEventReader reader, QName subTagType) throws XMLStreamException { - Builder<String, String> builder = ImmutableMap.builder(); + ImmutableMap.Builder<String, String> builder = ImmutableMap.builder(); while (reader.hasNext() && XmlResourceValues.isTag(XmlResourceValues.peekNextTag(reader), subTagType)) { StartElement element = reader.nextEvent().asStartElement(); @@ -156,7 +155,7 @@ public class AttrXmlResourceValue implements XmlResourceValue { @SuppressWarnings("deprecation") public static XmlResourceValue from(SerializeFormat.DataValueXml proto) throws InvalidProtocolBufferException { - Builder<String, ResourceXmlAttrValue> formats = + ImmutableMap.Builder<String, ResourceXmlAttrValue> formats = ImmutableMap.<String, AttrXmlResourceValue.ResourceXmlAttrValue>builder(); for (Entry<String, SerializeFormat.DataValueXml> entry : proto.getMappedXmlValue().entrySet()) { switch (entry.getKey()) { @@ -200,8 +199,7 @@ public class AttrXmlResourceValue implements XmlResourceValue { } public static XmlResourceValue from(Value proto) throws InvalidProtocolBufferException { - Builder<String, ResourceXmlAttrValue> formats = - ImmutableMap.builder(); + ImmutableMap.Builder<String, ResourceXmlAttrValue> formats = ImmutableMap.builder(); Attribute attribute = proto.getCompoundValue().getAttr(); int formatFlags = attribute.getFormatFlags(); @@ -280,7 +278,7 @@ public class AttrXmlResourceValue implements XmlResourceValue { } } - Builder<String, ResourceXmlAttrValue> formats = ImmutableMap.builder(); + ImmutableMap.Builder<String, ResourceXmlAttrValue> formats = ImmutableMap.builder(); for (String formatName : formatNames) { switch (formatName) { case FLAGS: @@ -455,7 +453,7 @@ public class AttrXmlResourceValue implements XmlResourceValue { public static Entry<String, ResourceXmlAttrValue> asEntryOf(String... keyThenValue) { Preconditions.checkArgument(keyThenValue.length > 0); Preconditions.checkArgument(keyThenValue.length % 2 == 0); - Builder<String, String> builder = ImmutableMap.builder(); + ImmutableMap.Builder<String, String> builder = ImmutableMap.builder(); for (int i = 0; i < keyThenValue.length; i += 2) { builder.put(keyThenValue[i], keyThenValue[i + 1]); } @@ -531,7 +529,7 @@ public class AttrXmlResourceValue implements XmlResourceValue { @VisibleForTesting public static Entry<String, ResourceXmlAttrValue> asEntryOf(String... keyThenValue) { - Builder<String, String> builder = ImmutableMap.builder(); + ImmutableMap.Builder<String, String> builder = ImmutableMap.builder(); Preconditions.checkArgument(keyThenValue.length > 0); Preconditions.checkArgument(keyThenValue.length % 2 == 0); for (int i = 0; i < keyThenValue.length; i += 2) { diff --git a/src/tools/android/java/com/google/devtools/build/android/xml/StyleableXmlResourceValue.java b/src/tools/android/java/com/google/devtools/build/android/xml/StyleableXmlResourceValue.java index 3f56cf726e..e8df3d93d6 100644 --- a/src/tools/android/java/com/google/devtools/build/android/xml/StyleableXmlResourceValue.java +++ b/src/tools/android/java/com/google/devtools/build/android/xml/StyleableXmlResourceValue.java @@ -19,7 +19,6 @@ import com.google.common.annotations.VisibleForTesting; import com.google.common.base.Function; import com.google.common.base.MoreObjects; import com.google.common.collect.ImmutableMap; -import com.google.common.collect.ImmutableMap.Builder; import com.google.common.collect.Iterables; import com.google.devtools.build.android.AndroidCompiledDataDeserializer.ReferenceResolver; import com.google.devtools.build.android.AndroidDataWritingVisitor; @@ -96,7 +95,7 @@ public class StyleableXmlResourceValue implements XmlResourceValue { private static Map<FullyQualifiedName, Boolean> createAttrDefinitionMap( FullyQualifiedName[] attrNames, Boolean definitionType) { - Builder<FullyQualifiedName, Boolean> builder = ImmutableMap.builder(); + ImmutableMap.Builder<FullyQualifiedName, Boolean> builder = ImmutableMap.builder(); for (FullyQualifiedName attrName : attrNames) { builder.put(attrName, definitionType); } |