Global cleanup change.

--
PiperOrigin-RevId: 149652245
MOS_MIGRATED_REVID=149652245

3 files changed, 11 insertions, 14 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/cmdline/TargetPattern.java b/src/main/java/com/google/devtools/build/lib/cmdline/TargetPattern.java
index 88f891c1f3..f599ef3519 100644
--- a/src/main/java/com/google/devtools/build/lib/cmdline/TargetPattern.java
+++ b/src/main/java/com/google/devtools/build/lib/cmdline/TargetPattern.java
@@ -616,16 +616,14 @@ public abstract class TargetPattern implements Serializable {
      * The set of target-pattern suffixes which indicate wildcards over all <em>rules</em> in a
      * single package.
      */
-    private static final List<String> ALL_RULES_IN_SUFFIXES = ImmutableList.of(
-        "all");
+    private static final ImmutableList<String> ALL_RULES_IN_SUFFIXES = ImmutableList.of("all");
 
     /**
      * The set of target-pattern suffixes which indicate wildcards over all <em>targets</em> in a
      * single package.
      */
-    private static final List<String> ALL_TARGETS_IN_SUFFIXES = ImmutableList.of(
-        "*",
-        "all-targets");
+    private static final ImmutableList<String> ALL_TARGETS_IN_SUFFIXES =
+        ImmutableList.of("*", "all-targets");
 
     private static final List<String> SUFFIXES;
 
diff --git a/src/main/java/com/google/devtools/build/lib/pkgcache/PathPackageLocator.java b/src/main/java/com/google/devtools/build/lib/pkgcache/PathPackageLocator.java
index 4383505f3b..3ccbc1db99 100644
--- a/src/main/java/com/google/devtools/build/lib/pkgcache/PathPackageLocator.java
+++ b/src/main/java/com/google/devtools/build/lib/pkgcache/PathPackageLocator.java
@@ -28,13 +28,11 @@ import com.google.devtools.build.lib.vfs.Path;
 import com.google.devtools.build.lib.vfs.PathFragment;
 import com.google.devtools.build.lib.vfs.Symlinks;
 import com.google.devtools.build.lib.vfs.UnixGlob;
-
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Objects;
-import java.util.Set;
 import java.util.concurrent.atomic.AtomicReference;
 
 /**
@@ -47,7 +45,8 @@ import java.util.concurrent.atomic.AtomicReference;
  */
 public class PathPackageLocator implements Serializable {
 
-  public static final Set<String> DEFAULT_TOP_LEVEL_EXCLUDES = ImmutableSet.of("experimental");
+  public static final ImmutableSet<String> DEFAULT_TOP_LEVEL_EXCLUDES =
+      ImmutableSet.of("experimental");
 
   private final ImmutableList<Path> pathEntries;
   // Transient because this is an injected value in Skyframe, and as such, its serialized
diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidBinary.java b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidBinary.java
index 1574af2358..5891a1e38d 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidBinary.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidBinary.java
@@ -81,7 +81,6 @@ import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
-import java.util.Set;
 import javax.annotation.Nullable;
 
 /**
@@ -1772,11 +1771,12 @@ public abstract class AndroidBinary implements RuleConfiguredTargetFactory {
    * set with an old SDK, we will exit with an error to alert the developer that his application
    * might not run on devices that the used SDK still supports.
    */
-  private static final Set<String> RUNTIMES_THAT_DONT_SUPPORT_NATIVE_MULTIDEXING = ImmutableSet.of(
-      "/android_sdk_linux/platforms/android_10/", "/android_sdk_linux/platforms/android_13/",
-      "/android_sdk_linux/platforms/android_15/", "/android_sdk_linux/platforms/android_16/",
-      "/android_sdk_linux/platforms/android_17/", "/android_sdk_linux/platforms/android_18/",
-      "/android_sdk_linux/platforms/android_19/", "/android_sdk_linux/platforms/android_20/");
+  private static final ImmutableSet<String> RUNTIMES_THAT_DONT_SUPPORT_NATIVE_MULTIDEXING =
+      ImmutableSet.of(
+          "/android_sdk_linux/platforms/android_10/", "/android_sdk_linux/platforms/android_13/",
+          "/android_sdk_linux/platforms/android_15/", "/android_sdk_linux/platforms/android_16/",
+          "/android_sdk_linux/platforms/android_17/", "/android_sdk_linux/platforms/android_18/",
+          "/android_sdk_linux/platforms/android_19/", "/android_sdk_linux/platforms/android_20/");
 
   /**
    * Returns true if the runtime contained in the Android SDK used to build this rule supports the