Cleanup android rules and android tools so that my IDE stops complaining to me.

--
PiperOrigin-RevId: 145569440
MOS_MIGRATED_REVID=145569440

9 files changed, 12 insertions, 27 deletions

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 {