From dd335bed009f40f66a7376c803d44193b7409e2f Mon Sep 17 00:00:00 2001 From: Adam Michael Date: Wed, 25 Jan 2017 19:02:24 +0000 Subject: Cleanup android rules and android tools so that my IDE stops complaining to me. -- PiperOrigin-RevId: 145569440 MOS_MIGRATED_REVID=145569440 --- .../build/android/DensitySpecificManifestProcessor.java | 13 +++++-------- .../build/android/DensitySpecificResourceFilter.java | 1 - .../build/android/DependencySymbolFileProvider.java | 4 +--- .../devtools/build/android/FailedFutureAggregator.java | 4 +--- .../devtools/build/android/ManifestMergerAction.java | 16 ++++++---------- .../devtools/build/android/RClassGeneratorAction.java | 10 ++++------ .../devtools/build/android/SplitConfigurationFilter.java | 1 - .../google/devtools/build/android/dexer/DexBuilder.java | 5 +---- .../build/android/dexer/DexConversionEnqueuer.java | 2 -- .../devtools/build/android/dexer/DexFileAggregator.java | 8 +++----- .../devtools/build/android/dexer/DexFileArchive.java | 4 +--- .../devtools/build/android/dexer/DexFileMerger.java | 8 +++----- .../google/devtools/build/android/dexer/DexFiles.java | 1 - .../com/google/devtools/build/android/dexer/Dexing.java | 9 ++++----- .../devtools/build/android/dexer/MergingDexer.java | 1 - .../devtools/build/android/dexer/ZipEntryPredicates.java | 1 - .../build/android/ideinfo/ArtifactLocationConverter.java | 1 - .../android/ideinfo/ArtifactLocationListConverter.java | 1 - .../build/android/ideinfo/PackageParserIoProvider.java | 2 -- .../google/devtools/build/android/idlclass/IdlClass.java | 1 - .../devtools/build/android/idlclass/IdlClassOptions.java | 1 - .../incrementaldeployment/IncrementalClassLoader.java | 2 -- .../android/incrementaldeployment/StubApplication.java | 1 - .../build/android/resources/FieldInitializer.java | 5 ++--- .../android/resources/IntArrayFieldInitializer.java | 6 ++---- .../build/android/resources/IntFieldInitializer.java | 5 ++--- .../devtools/build/android/ziputils/BufferedFile.java | 1 - .../build/android/ziputils/CentralDirectory.java | 1 - .../devtools/build/android/ziputils/DexMapper.java | 1 - .../devtools/build/android/ziputils/DexReducer.java | 1 - .../google/devtools/build/android/ziputils/ScanUtil.java | 1 - .../google/devtools/build/android/ziputils/SplitZip.java | 1 - .../devtools/build/android/ziputils/SplitZipFilters.java | 1 - .../google/devtools/build/android/ziputils/Splitter.java | 1 - .../google/devtools/build/android/ziputils/ZipIn.java | 1 + 35 files changed, 36 insertions(+), 86 deletions(-) (limited to 'src/tools/android/java/com/google') diff --git a/src/tools/android/java/com/google/devtools/build/android/DensitySpecificManifestProcessor.java b/src/tools/android/java/com/google/devtools/build/android/DensitySpecificManifestProcessor.java index 13938dff32..5616a2adb5 100644 --- a/src/tools/android/java/com/google/devtools/build/android/DensitySpecificManifestProcessor.java +++ b/src/tools/android/java/com/google/devtools/build/android/DensitySpecificManifestProcessor.java @@ -16,13 +16,6 @@ package com.google.devtools.build.android; import com.google.common.collect.ImmutableBiMap; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; - -import org.w3c.dom.Document; -import org.w3c.dom.Element; -import org.w3c.dom.Node; -import org.w3c.dom.NodeList; -import org.xml.sax.SAXException; - import java.io.IOException; import java.nio.file.Files; import java.nio.file.Path; @@ -30,7 +23,6 @@ import java.util.HashSet; import java.util.List; import java.util.Map; import java.util.Set; - import javax.xml.XMLConstants; import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; @@ -40,6 +32,11 @@ import javax.xml.transform.TransformerException; import javax.xml.transform.TransformerFactory; import javax.xml.transform.dom.DOMSource; import javax.xml.transform.stream.StreamResult; +import org.w3c.dom.Document; +import org.w3c.dom.Element; +import org.w3c.dom.Node; +import org.w3c.dom.NodeList; +import org.xml.sax.SAXException; /** * Modifies a {@link MergedAndroidData} manifest for the specified densities. diff --git a/src/tools/android/java/com/google/devtools/build/android/DensitySpecificResourceFilter.java b/src/tools/android/java/com/google/devtools/build/android/DensitySpecificResourceFilter.java index c030c1fd8d..cdddc43a62 100644 --- a/src/tools/android/java/com/google/devtools/build/android/DensitySpecificResourceFilter.java +++ b/src/tools/android/java/com/google/devtools/build/android/DensitySpecificResourceFilter.java @@ -27,7 +27,6 @@ import com.google.common.collect.ImmutableMultimap; import com.google.common.collect.Lists; import com.google.common.collect.Multimap; import com.google.common.collect.Ordering; - import java.io.IOException; import java.nio.file.FileVisitOption; import java.nio.file.FileVisitResult; diff --git a/src/tools/android/java/com/google/devtools/build/android/DependencySymbolFileProvider.java b/src/tools/android/java/com/google/devtools/build/android/DependencySymbolFileProvider.java index 7ab881453c..871dd7f16c 100644 --- a/src/tools/android/java/com/google/devtools/build/android/DependencySymbolFileProvider.java +++ b/src/tools/android/java/com/google/devtools/build/android/DependencySymbolFileProvider.java @@ -13,10 +13,8 @@ // limitations under the License. package com.google.devtools.build.android; -import com.google.common.base.Preconditions; - import com.android.builder.dependency.SymbolFileProvider; - +import com.google.common.base.Preconditions; import java.io.File; import java.nio.file.FileSystem; import java.nio.file.FileSystems; diff --git a/src/tools/android/java/com/google/devtools/build/android/FailedFutureAggregator.java b/src/tools/android/java/com/google/devtools/build/android/FailedFutureAggregator.java index ba13f8247f..e6cd43da47 100644 --- a/src/tools/android/java/com/google/devtools/build/android/FailedFutureAggregator.java +++ b/src/tools/android/java/com/google/devtools/build/android/FailedFutureAggregator.java @@ -13,10 +13,8 @@ // limitations under the License. package com.google.devtools.build.android; -import com.google.common.util.concurrent.ListenableFuture; - import com.android.ide.common.res2.MergingException; - +import com.google.common.util.concurrent.ListenableFuture; import java.io.IOException; import java.util.List; import java.util.concurrent.ExecutionException; diff --git a/src/tools/android/java/com/google/devtools/build/android/ManifestMergerAction.java b/src/tools/android/java/com/google/devtools/build/android/ManifestMergerAction.java index 99d0cdb430..09c3b92946 100644 --- a/src/tools/android/java/com/google/devtools/build/android/ManifestMergerAction.java +++ b/src/tools/android/java/com/google/devtools/build/android/ManifestMergerAction.java @@ -15,6 +15,8 @@ package com.google.devtools.build.android; import static java.util.logging.Level.SEVERE; +import com.android.manifmerger.ManifestMerger2.MergeType; +import com.android.utils.StdLogger; import com.google.common.collect.ImmutableMap; import com.google.devtools.build.android.Converters.ExistingPathConverter; import com.google.devtools.build.android.Converters.ExistingPathStringDictionaryConverter; @@ -24,15 +26,6 @@ import com.google.devtools.build.android.Converters.StringDictionaryConverter; import com.google.devtools.common.options.Option; import com.google.devtools.common.options.OptionsBase; import com.google.devtools.common.options.OptionsParser; - -import com.android.manifmerger.ManifestMerger2.MergeType; -import com.android.utils.StdLogger; - -import org.w3c.dom.Document; -import org.w3c.dom.Node; -import org.w3c.dom.NodeList; -import org.xml.sax.SAXException; - import java.io.IOException; import java.nio.file.Files; import java.nio.file.Path; @@ -41,7 +34,6 @@ import java.nio.file.attribute.FileTime; import java.util.Map; import java.util.Map.Entry; import java.util.logging.Logger; - import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; import javax.xml.parsers.ParserConfigurationException; @@ -51,6 +43,10 @@ import javax.xml.transform.TransformerFactory; import javax.xml.transform.TransformerFactoryConfigurationError; import javax.xml.transform.dom.DOMSource; import javax.xml.transform.stream.StreamResult; +import org.w3c.dom.Document; +import org.w3c.dom.Node; +import org.w3c.dom.NodeList; +import org.xml.sax.SAXException; /** * An action to perform manifest merging using the Gradle manifest merger. diff --git a/src/tools/android/java/com/google/devtools/build/android/RClassGeneratorAction.java b/src/tools/android/java/com/google/devtools/build/android/RClassGeneratorAction.java index 15c1feaae6..76e8496221 100644 --- a/src/tools/android/java/com/google/devtools/build/android/RClassGeneratorAction.java +++ b/src/tools/android/java/com/google/devtools/build/android/RClassGeneratorAction.java @@ -13,6 +13,10 @@ // limitations under the License. package com.google.devtools.build.android; +import com.android.builder.core.VariantConfiguration; +import com.android.builder.dependency.SymbolFileProvider; +import com.android.builder.internal.SymbolLoader; +import com.android.utils.StdLogger; import com.google.common.base.Preconditions; import com.google.common.base.Stopwatch; import com.google.common.collect.ArrayListMultimap; @@ -22,12 +26,6 @@ import com.google.devtools.build.android.Converters.PathConverter; import com.google.devtools.common.options.Option; import com.google.devtools.common.options.OptionsBase; import com.google.devtools.common.options.OptionsParser; - -import com.android.builder.core.VariantConfiguration; -import com.android.builder.dependency.SymbolFileProvider; -import com.android.builder.internal.SymbolLoader; -import com.android.utils.StdLogger; - import java.nio.charset.StandardCharsets; import java.nio.file.Files; import java.nio.file.Path; diff --git a/src/tools/android/java/com/google/devtools/build/android/SplitConfigurationFilter.java b/src/tools/android/java/com/google/devtools/build/android/SplitConfigurationFilter.java index 64f32561cc..c1454e4d76 100644 --- a/src/tools/android/java/com/google/devtools/build/android/SplitConfigurationFilter.java +++ b/src/tools/android/java/com/google/devtools/build/android/SplitConfigurationFilter.java @@ -24,7 +24,6 @@ import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSortedSet; import com.google.common.collect.Iterables; import com.google.common.collect.Ordering; - import java.util.ArrayList; import java.util.List; import java.util.Locale; diff --git a/src/tools/android/java/com/google/devtools/build/android/dexer/DexBuilder.java b/src/tools/android/java/com/google/devtools/build/android/dexer/DexBuilder.java index 20ef957009..b22b9a6452 100644 --- a/src/tools/android/java/com/google/devtools/build/android/dexer/DexBuilder.java +++ b/src/tools/android/java/com/google/devtools/build/android/dexer/DexBuilder.java @@ -17,6 +17,7 @@ import static com.google.common.base.Preconditions.checkArgument; import static java.nio.charset.StandardCharsets.ISO_8859_1; import static java.util.concurrent.Executors.newFixedThreadPool; +import com.android.dx.command.DxConsole; import com.google.common.annotations.VisibleForTesting; import com.google.common.cache.Cache; import com.google.common.cache.CacheBuilder; @@ -32,9 +33,6 @@ import com.google.devtools.common.options.Option; import com.google.devtools.common.options.OptionsBase; import com.google.devtools.common.options.OptionsParser; import com.google.devtools.common.options.OptionsParsingException; - -import com.android.dx.command.DxConsole; - import java.io.BufferedOutputStream; import java.io.ByteArrayOutputStream; import java.io.IOException; @@ -48,7 +46,6 @@ import java.util.concurrent.ExecutorService; import java.util.concurrent.Future; import java.util.zip.ZipFile; import java.util.zip.ZipOutputStream; - import javax.annotation.Nullable; /** diff --git a/src/tools/android/java/com/google/devtools/build/android/dexer/DexConversionEnqueuer.java b/src/tools/android/java/com/google/devtools/build/android/dexer/DexConversionEnqueuer.java index 2c84af3683..b66e725dc3 100644 --- a/src/tools/android/java/com/google/devtools/build/android/dexer/DexConversionEnqueuer.java +++ b/src/tools/android/java/com/google/devtools/build/android/dexer/DexConversionEnqueuer.java @@ -20,7 +20,6 @@ import static com.google.common.util.concurrent.Futures.immediateFuture; import com.google.common.cache.Cache; import com.google.common.io.ByteStreams; import com.google.devtools.build.android.dexer.Dexing.DexingKey; - import java.io.IOException; import java.io.InputStream; import java.util.Enumeration; @@ -31,7 +30,6 @@ import java.util.concurrent.ExecutorService; import java.util.concurrent.Future; import java.util.zip.ZipEntry; import java.util.zip.ZipFile; - import javax.annotation.Nullable; /** diff --git a/src/tools/android/java/com/google/devtools/build/android/dexer/DexFileAggregator.java b/src/tools/android/java/com/google/devtools/build/android/dexer/DexFileAggregator.java index b30eb9dbe9..d481323b06 100644 --- a/src/tools/android/java/com/google/devtools/build/android/dexer/DexFileAggregator.java +++ b/src/tools/android/java/com/google/devtools/build/android/dexer/DexFileAggregator.java @@ -15,10 +15,6 @@ package com.google.devtools.build.android.dexer; import static com.google.common.base.Preconditions.checkState; -import com.google.auto.value.AutoValue; -import com.google.common.annotations.VisibleForTesting; -import com.google.common.collect.ImmutableList; - import com.android.dex.Dex; import com.android.dex.DexFormat; import com.android.dex.FieldId; @@ -26,7 +22,9 @@ import com.android.dex.MethodId; import com.android.dx.dex.file.DexFile; import com.android.dx.merge.CollisionPolicy; import com.android.dx.merge.DexMerger; - +import com.google.auto.value.AutoValue; +import com.google.common.annotations.VisibleForTesting; +import com.google.common.collect.ImmutableList; import java.io.Closeable; import java.io.IOException; import java.nio.BufferOverflowException; diff --git a/src/tools/android/java/com/google/devtools/build/android/dexer/DexFileArchive.java b/src/tools/android/java/com/google/devtools/build/android/dexer/DexFileArchive.java index 20edd0b886..ed0971c8b8 100644 --- a/src/tools/android/java/com/google/devtools/build/android/dexer/DexFileArchive.java +++ b/src/tools/android/java/com/google/devtools/build/android/dexer/DexFileArchive.java @@ -13,11 +13,9 @@ // limitations under the License. package com.google.devtools.build.android.dexer; -import com.google.common.io.ByteStreams; - import com.android.dex.Dex; import com.android.dx.dex.file.DexFile; - +import com.google.common.io.ByteStreams; import java.io.Closeable; import java.io.IOException; import java.io.InputStream; diff --git a/src/tools/android/java/com/google/devtools/build/android/dexer/DexFileMerger.java b/src/tools/android/java/com/google/devtools/build/android/dexer/DexFileMerger.java index 7f6692b80d..ae535a4b4c 100644 --- a/src/tools/android/java/com/google/devtools/build/android/dexer/DexFileMerger.java +++ b/src/tools/android/java/com/google/devtools/build/android/dexer/DexFileMerger.java @@ -17,6 +17,9 @@ import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Preconditions.checkState; import static java.nio.charset.StandardCharsets.UTF_8; +import com.android.dex.Dex; +import com.android.dex.DexFormat; +import com.android.dx.command.DxConsole; import com.google.common.annotations.VisibleForTesting; import com.google.common.base.Predicate; import com.google.common.base.Predicates; @@ -30,11 +33,6 @@ import com.google.devtools.common.options.EnumConverter; import com.google.devtools.common.options.Option; import com.google.devtools.common.options.OptionsBase; import com.google.devtools.common.options.OptionsParser; - -import com.android.dex.Dex; -import com.android.dex.DexFormat; -import com.android.dx.command.DxConsole; - import java.io.BufferedOutputStream; import java.io.IOException; import java.io.InputStream; diff --git a/src/tools/android/java/com/google/devtools/build/android/dexer/DexFiles.java b/src/tools/android/java/com/google/devtools/build/android/dexer/DexFiles.java index dc7004e42c..25466c0dc6 100644 --- a/src/tools/android/java/com/google/devtools/build/android/dexer/DexFiles.java +++ b/src/tools/android/java/com/google/devtools/build/android/dexer/DexFiles.java @@ -15,7 +15,6 @@ package com.google.devtools.build.android.dexer; import com.android.dex.Dex; import com.android.dx.dex.file.DexFile; - import java.io.IOException; /** diff --git a/src/tools/android/java/com/google/devtools/build/android/dexer/Dexing.java b/src/tools/android/java/com/google/devtools/build/android/dexer/Dexing.java index 26fd9facaa..47a2e1c203 100644 --- a/src/tools/android/java/com/google/devtools/build/android/dexer/Dexing.java +++ b/src/tools/android/java/com/google/devtools/build/android/dexer/Dexing.java @@ -13,11 +13,6 @@ // limitations under the License. package com.google.devtools.build.android.dexer; -import com.google.auto.value.AutoValue; -import com.google.common.annotations.VisibleForTesting; -import com.google.devtools.common.options.Option; -import com.google.devtools.common.options.OptionsBase; - import com.android.dx.cf.direct.DirectClassFile; import com.android.dx.cf.direct.StdAttributeFactory; import com.android.dx.command.DxConsole; @@ -28,6 +23,10 @@ import com.android.dx.dex.code.PositionList; import com.android.dx.dex.file.ClassDefItem; import com.android.dx.dex.file.DexFile; import com.android.dx.util.ByteArray; +import com.google.auto.value.AutoValue; +import com.google.common.annotations.VisibleForTesting; +import com.google.devtools.common.options.Option; +import com.google.devtools.common.options.OptionsBase; /** * Common helper class that encodes Java classes into {@link DexFile}s. diff --git a/src/tools/android/java/com/google/devtools/build/android/dexer/MergingDexer.java b/src/tools/android/java/com/google/devtools/build/android/dexer/MergingDexer.java index 0c565cbbd9..a102b9ccc5 100644 --- a/src/tools/android/java/com/google/devtools/build/android/dexer/MergingDexer.java +++ b/src/tools/android/java/com/google/devtools/build/android/dexer/MergingDexer.java @@ -17,7 +17,6 @@ import static com.google.common.base.Preconditions.checkState; import com.android.dx.cf.direct.DirectClassFile; import com.android.dx.dex.file.DexFile; - import java.io.IOException; class MergingDexer { diff --git a/src/tools/android/java/com/google/devtools/build/android/dexer/ZipEntryPredicates.java b/src/tools/android/java/com/google/devtools/build/android/dexer/ZipEntryPredicates.java index dcdc6d7a3d..08e77bf4f2 100644 --- a/src/tools/android/java/com/google/devtools/build/android/dexer/ZipEntryPredicates.java +++ b/src/tools/android/java/com/google/devtools/build/android/dexer/ZipEntryPredicates.java @@ -15,7 +15,6 @@ package com.google.devtools.build.android.dexer; import com.google.common.base.Predicate; import com.google.common.collect.ImmutableSet; - import java.util.zip.ZipEntry; class ZipEntryPredicates { diff --git a/src/tools/android/java/com/google/devtools/build/android/ideinfo/ArtifactLocationConverter.java b/src/tools/android/java/com/google/devtools/build/android/ideinfo/ArtifactLocationConverter.java index c64b616478..f846f90de4 100644 --- a/src/tools/android/java/com/google/devtools/build/android/ideinfo/ArtifactLocationConverter.java +++ b/src/tools/android/java/com/google/devtools/build/android/ideinfo/ArtifactLocationConverter.java @@ -20,7 +20,6 @@ import com.google.devtools.build.android.Converters.PathConverter; import com.google.devtools.build.lib.ideinfo.androidstudio.PackageManifestOuterClass.ArtifactLocation; import com.google.devtools.common.options.Converter; import com.google.devtools.common.options.OptionsParsingException; - import java.nio.file.Path; import java.util.Iterator; import java.util.NoSuchElementException; diff --git a/src/tools/android/java/com/google/devtools/build/android/ideinfo/ArtifactLocationListConverter.java b/src/tools/android/java/com/google/devtools/build/android/ideinfo/ArtifactLocationListConverter.java index a2e162a706..535c5fc342 100644 --- a/src/tools/android/java/com/google/devtools/build/android/ideinfo/ArtifactLocationListConverter.java +++ b/src/tools/android/java/com/google/devtools/build/android/ideinfo/ArtifactLocationListConverter.java @@ -18,7 +18,6 @@ import com.google.common.collect.Lists; import com.google.devtools.build.lib.ideinfo.androidstudio.PackageManifestOuterClass.ArtifactLocation; import com.google.devtools.common.options.Converter; import com.google.devtools.common.options.OptionsParsingException; - import java.util.Collections; import java.util.List; diff --git a/src/tools/android/java/com/google/devtools/build/android/ideinfo/PackageParserIoProvider.java b/src/tools/android/java/com/google/devtools/build/android/ideinfo/PackageParserIoProvider.java index be555c8d0e..607ed9bdeb 100644 --- a/src/tools/android/java/com/google/devtools/build/android/ideinfo/PackageParserIoProvider.java +++ b/src/tools/android/java/com/google/devtools/build/android/ideinfo/PackageParserIoProvider.java @@ -16,14 +16,12 @@ package com.google.devtools.build.android.ideinfo; import com.google.common.annotations.VisibleForTesting; import com.google.protobuf.MessageLite; - import java.io.BufferedReader; import java.io.IOException; import java.io.OutputStream; import java.nio.charset.StandardCharsets; import java.nio.file.Files; import java.nio.file.Path; - import javax.annotation.Nonnull; /** diff --git a/src/tools/android/java/com/google/devtools/build/android/idlclass/IdlClass.java b/src/tools/android/java/com/google/devtools/build/android/idlclass/IdlClass.java index 8504f335c6..fabf09a2d3 100644 --- a/src/tools/android/java/com/google/devtools/build/android/idlclass/IdlClass.java +++ b/src/tools/android/java/com/google/devtools/build/android/idlclass/IdlClass.java @@ -23,7 +23,6 @@ import com.google.devtools.build.buildjar.jarhelper.JarCreator; import com.google.devtools.build.buildjar.proto.JavaCompilation.CompilationUnit; import com.google.devtools.build.buildjar.proto.JavaCompilation.Manifest; import com.google.devtools.common.options.OptionsParser; - import java.io.IOException; import java.io.InputStream; import java.nio.file.Files; diff --git a/src/tools/android/java/com/google/devtools/build/android/idlclass/IdlClassOptions.java b/src/tools/android/java/com/google/devtools/build/android/idlclass/IdlClassOptions.java index 22363ad94e..fbceb75a33 100644 --- a/src/tools/android/java/com/google/devtools/build/android/idlclass/IdlClassOptions.java +++ b/src/tools/android/java/com/google/devtools/build/android/idlclass/IdlClassOptions.java @@ -18,7 +18,6 @@ import com.google.devtools.build.android.Converters.ExistingPathConverter; import com.google.devtools.build.android.Converters.PathConverter; import com.google.devtools.common.options.Option; import com.google.devtools.common.options.OptionsBase; - import java.nio.file.Path; /** The options for a {@IdlClass} action. */ diff --git a/src/tools/android/java/com/google/devtools/build/android/incrementaldeployment/IncrementalClassLoader.java b/src/tools/android/java/com/google/devtools/build/android/incrementaldeployment/IncrementalClassLoader.java index e4d9030578..fb023f719c 100644 --- a/src/tools/android/java/com/google/devtools/build/android/incrementaldeployment/IncrementalClassLoader.java +++ b/src/tools/android/java/com/google/devtools/build/android/incrementaldeployment/IncrementalClassLoader.java @@ -15,9 +15,7 @@ package com.google.devtools.build.android.incrementaldeployment; import android.util.Log; - import dalvik.system.BaseDexClassLoader; - import java.io.File; import java.lang.reflect.Field; import java.util.List; diff --git a/src/tools/android/java/com/google/devtools/build/android/incrementaldeployment/StubApplication.java b/src/tools/android/java/com/google/devtools/build/android/incrementaldeployment/StubApplication.java index 2107c37687..0b91d03207 100644 --- a/src/tools/android/java/com/google/devtools/build/android/incrementaldeployment/StubApplication.java +++ b/src/tools/android/java/com/google/devtools/build/android/incrementaldeployment/StubApplication.java @@ -21,7 +21,6 @@ import android.content.res.AssetManager; import android.content.res.Resources; import android.util.ArrayMap; import android.util.Log; - import java.io.BufferedReader; import java.io.ByteArrayOutputStream; import java.io.File; diff --git a/src/tools/android/java/com/google/devtools/build/android/resources/FieldInitializer.java b/src/tools/android/java/com/google/devtools/build/android/resources/FieldInitializer.java index 7f1672dfe5..a1e322fef6 100644 --- a/src/tools/android/java/com/google/devtools/build/android/resources/FieldInitializer.java +++ b/src/tools/android/java/com/google/devtools/build/android/resources/FieldInitializer.java @@ -13,11 +13,10 @@ // limitations under the License. package com.google.devtools.build.android.resources; -import org.objectweb.asm.ClassWriter; -import org.objectweb.asm.commons.InstructionAdapter; - import java.io.IOException; import java.io.Writer; +import org.objectweb.asm.ClassWriter; +import org.objectweb.asm.commons.InstructionAdapter; /** * Represents a field and its initializer (where initialization is either part of the field diff --git a/src/tools/android/java/com/google/devtools/build/android/resources/IntArrayFieldInitializer.java b/src/tools/android/java/com/google/devtools/build/android/resources/IntArrayFieldInitializer.java index 4d37a5ae0e..48e6496d89 100644 --- a/src/tools/android/java/com/google/devtools/build/android/resources/IntArrayFieldInitializer.java +++ b/src/tools/android/java/com/google/devtools/build/android/resources/IntArrayFieldInitializer.java @@ -17,14 +17,12 @@ import com.google.common.base.Preconditions; import com.google.common.base.Splitter; import com.google.common.collect.ImmutableCollection; import com.google.common.collect.ImmutableList; - +import java.io.IOException; +import java.io.Writer; import org.objectweb.asm.ClassWriter; import org.objectweb.asm.Type; import org.objectweb.asm.commons.InstructionAdapter; -import java.io.IOException; -import java.io.Writer; - /** * Models an int[] field initializer. */ diff --git a/src/tools/android/java/com/google/devtools/build/android/resources/IntFieldInitializer.java b/src/tools/android/java/com/google/devtools/build/android/resources/IntFieldInitializer.java index cf7c9f454a..400c26789e 100644 --- a/src/tools/android/java/com/google/devtools/build/android/resources/IntFieldInitializer.java +++ b/src/tools/android/java/com/google/devtools/build/android/resources/IntFieldInitializer.java @@ -13,11 +13,10 @@ // limitations under the License. package com.google.devtools.build.android.resources; -import org.objectweb.asm.ClassWriter; -import org.objectweb.asm.commons.InstructionAdapter; - import java.io.IOException; import java.io.Writer; +import org.objectweb.asm.ClassWriter; +import org.objectweb.asm.commons.InstructionAdapter; /** * Models an int field initializer. diff --git a/src/tools/android/java/com/google/devtools/build/android/ziputils/BufferedFile.java b/src/tools/android/java/com/google/devtools/build/android/ziputils/BufferedFile.java index 84714ed94f..41e5f30277 100644 --- a/src/tools/android/java/com/google/devtools/build/android/ziputils/BufferedFile.java +++ b/src/tools/android/java/com/google/devtools/build/android/ziputils/BufferedFile.java @@ -14,7 +14,6 @@ package com.google.devtools.build.android.ziputils; import com.google.common.base.Preconditions; - import java.io.IOException; import java.nio.ByteBuffer; import java.nio.channels.FileChannel; diff --git a/src/tools/android/java/com/google/devtools/build/android/ziputils/CentralDirectory.java b/src/tools/android/java/com/google/devtools/build/android/ziputils/CentralDirectory.java index 25e50c873d..9fcb59eb67 100644 --- a/src/tools/android/java/com/google/devtools/build/android/ziputils/CentralDirectory.java +++ b/src/tools/android/java/com/google/devtools/build/android/ziputils/CentralDirectory.java @@ -16,7 +16,6 @@ package com.google.devtools.build.android.ziputils; import static com.google.devtools.build.android.ziputils.DirectoryEntry.CENOFF; import com.google.common.base.Preconditions; - import java.nio.ByteBuffer; import java.util.ArrayList; import java.util.List; diff --git a/src/tools/android/java/com/google/devtools/build/android/ziputils/DexMapper.java b/src/tools/android/java/com/google/devtools/build/android/ziputils/DexMapper.java index 694a00156a..972e973b7f 100644 --- a/src/tools/android/java/com/google/devtools/build/android/ziputils/DexMapper.java +++ b/src/tools/android/java/com/google/devtools/build/android/ziputils/DexMapper.java @@ -19,7 +19,6 @@ import com.google.common.base.Predicates; import com.google.devtools.common.options.Option; import com.google.devtools.common.options.OptionsBase; import com.google.devtools.common.options.OptionsParser; - import java.util.List; /** diff --git a/src/tools/android/java/com/google/devtools/build/android/ziputils/DexReducer.java b/src/tools/android/java/com/google/devtools/build/android/ziputils/DexReducer.java index 14f4197ed0..59d91899f0 100644 --- a/src/tools/android/java/com/google/devtools/build/android/ziputils/DexReducer.java +++ b/src/tools/android/java/com/google/devtools/build/android/ziputils/DexReducer.java @@ -27,7 +27,6 @@ import static com.google.devtools.build.android.ziputils.LocalFileHeader.LOCTIM; import com.google.devtools.common.options.Option; import com.google.devtools.common.options.OptionsBase; import com.google.devtools.common.options.OptionsParser; - import java.io.FileInputStream; import java.io.FileOutputStream; import java.io.IOException; diff --git a/src/tools/android/java/com/google/devtools/build/android/ziputils/ScanUtil.java b/src/tools/android/java/com/google/devtools/build/android/ziputils/ScanUtil.java index 166469ee22..9934fec3cc 100644 --- a/src/tools/android/java/com/google/devtools/build/android/ziputils/ScanUtil.java +++ b/src/tools/android/java/com/google/devtools/build/android/ziputils/ScanUtil.java @@ -14,7 +14,6 @@ package com.google.devtools.build.android.ziputils; import com.google.common.base.Preconditions; - import java.nio.ByteBuffer; /** diff --git a/src/tools/android/java/com/google/devtools/build/android/ziputils/SplitZip.java b/src/tools/android/java/com/google/devtools/build/android/ziputils/SplitZip.java index dabe4dd34b..7a1f81a7e9 100644 --- a/src/tools/android/java/com/google/devtools/build/android/ziputils/SplitZip.java +++ b/src/tools/android/java/com/google/devtools/build/android/ziputils/SplitZip.java @@ -28,7 +28,6 @@ import com.google.common.base.Preconditions; import com.google.common.base.Predicate; import com.google.common.base.Predicates; import com.google.common.collect.Sets; - import java.io.BufferedReader; import java.io.File; import java.io.FileInputStream; diff --git a/src/tools/android/java/com/google/devtools/build/android/ziputils/SplitZipFilters.java b/src/tools/android/java/com/google/devtools/build/android/ziputils/SplitZipFilters.java index 07c38e8889..c0ce172081 100644 --- a/src/tools/android/java/com/google/devtools/build/android/ziputils/SplitZipFilters.java +++ b/src/tools/android/java/com/google/devtools/build/android/ziputils/SplitZipFilters.java @@ -16,7 +16,6 @@ package com.google.devtools.build.android.ziputils; import com.google.common.base.Predicate; import com.google.common.base.Predicates; import com.google.common.collect.ImmutableSet; - import java.io.FileInputStream; import java.io.IOException; diff --git a/src/tools/android/java/com/google/devtools/build/android/ziputils/Splitter.java b/src/tools/android/java/com/google/devtools/build/android/ziputils/Splitter.java index d476581109..cc5640df92 100644 --- a/src/tools/android/java/com/google/devtools/build/android/ziputils/Splitter.java +++ b/src/tools/android/java/com/google/devtools/build/android/ziputils/Splitter.java @@ -14,7 +14,6 @@ package com.google.devtools.build.android.ziputils; import com.google.common.base.Preconditions; - import java.util.Collection; import java.util.HashMap; import java.util.Map; diff --git a/src/tools/android/java/com/google/devtools/build/android/ziputils/ZipIn.java b/src/tools/android/java/com/google/devtools/build/android/ziputils/ZipIn.java index 52ea3b6091..166066ea09 100644 --- a/src/tools/android/java/com/google/devtools/build/android/ziputils/ZipIn.java +++ b/src/tools/android/java/com/google/devtools/build/android/ziputils/ZipIn.java @@ -20,6 +20,7 @@ import static com.google.devtools.build.android.ziputils.DirectoryEntry.CENOFF; import static com.google.devtools.build.android.ziputils.DirectoryEntry.CENSIZ; import static com.google.devtools.build.android.ziputils.EndOfCentralDirectory.ENDOFF; import static com.google.devtools.build.android.ziputils.EndOfCentralDirectory.ENDSUB; + import java.io.IOException; import java.nio.ByteBuffer; import java.nio.ByteOrder; -- cgit v1.2.3