Global cleanup change.
--
PiperOrigin-RevId: 149652245
MOS_MIGRATED_REVID=149652245
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 88f891c..f599ef3 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 @@
* 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 4383505..3ccbc1db 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.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 @@
*/
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 1574af2..5891a1e 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.List;
import java.util.Map;
import java.util.Objects;
-import java.util.Set;
import javax.annotation.Nullable;
/**
@@ -1772,11 +1771,12 @@
* 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
diff --git a/src/tools/android/java/com/google/devtools/build/android/AndroidResourceClassWriter.java b/src/tools/android/java/com/google/devtools/build/android/AndroidResourceClassWriter.java
index fad5cf5..37fb7a8 100644
--- a/src/tools/android/java/com/google/devtools/build/android/AndroidResourceClassWriter.java
+++ b/src/tools/android/java/com/google/devtools/build/android/AndroidResourceClassWriter.java
@@ -176,10 +176,12 @@
* at all alphabetical. It depends on the order in which the types are processed, and whether or
* not previous types are present (compact). See the code in aapt Resource.cpp:buildResources().
* There are several seemingly arbitrary and different processing orders in the function, but the
- * ordering is determined specifically by the portion at: <a href="https://android.googlesource.com/platform/frameworks/base.git/+/marshmallow-release/tools/aapt/Resource.cpp#1254">
+ * ordering is determined specifically by the portion at: <a
+ * href="https://android.googlesource.com/platform/frameworks/base.git/+/marshmallow-release/tools/aapt/Resource.cpp#1254">
* Resource.cpp:buildResources() </a>
*
- * where it does:
+ * <p>where it does:
+ *
* <pre>
* if (drawables != NULL) { ... }
* if (mipmaps != NULL) { ... }
@@ -190,36 +192,36 @@
* ResourceType.STYLEABLE doesn't actually need a resource ID, so that is skipped. We encode the
* ordering in the following list.
*/
- private static final List<ResourceType> AAPT_TYPE_ORDERING = ImmutableList.of(
- ResourceType.DRAWABLE,
- ResourceType.MIPMAP,
- ResourceType.LAYOUT,
- ResourceType.ANIM,
- ResourceType.ANIMATOR,
- ResourceType.TRANSITION,
- ResourceType.INTERPOLATOR,
- ResourceType.XML,
- ResourceType.RAW,
- // Begin VALUES portion
- // Technically, aapt just assigns according to declaration order in the source value.xml files
- // so it isn't really deterministic. However, the Gradle merger sorts the values.xml file
- // before invoking aapt, so assume that is also done.
- ResourceType.ARRAY,
- ResourceType.BOOL,
- ResourceType.COLOR,
- ResourceType.DIMEN,
- ResourceType.FRACTION,
- ResourceType.ID,
- ResourceType.INTEGER,
- ResourceType.PLURALS,
- ResourceType.STRING,
- ResourceType.STYLE,
- // End VALUES portion
- // Technically, file-based COLOR resources come next. If we care about complete equivalence
- // we should separate the file-based resources from value-based resources so that we can
- // number them the same way.
- ResourceType.MENU
- );
+ private static final ImmutableList<ResourceType> AAPT_TYPE_ORDERING =
+ ImmutableList.of(
+ ResourceType.DRAWABLE,
+ ResourceType.MIPMAP,
+ ResourceType.LAYOUT,
+ ResourceType.ANIM,
+ ResourceType.ANIMATOR,
+ ResourceType.TRANSITION,
+ ResourceType.INTERPOLATOR,
+ ResourceType.XML,
+ ResourceType.RAW,
+ // Begin VALUES portion
+ // Technically, aapt just assigns according to declaration order in the source value.xml files
+ // so it isn't really deterministic. However, the Gradle merger sorts the values.xml file
+ // before invoking aapt, so assume that is also done.
+ ResourceType.ARRAY,
+ ResourceType.BOOL,
+ ResourceType.COLOR,
+ ResourceType.DIMEN,
+ ResourceType.FRACTION,
+ ResourceType.ID,
+ ResourceType.INTEGER,
+ ResourceType.PLURALS,
+ ResourceType.STRING,
+ ResourceType.STYLE,
+ // End VALUES portion
+ // Technically, file-based COLOR resources come next. If we care about complete equivalence
+ // we should separate the file-based resources from value-based resources so that we can
+ // number them the same way.
+ ResourceType.MENU);
private Map<ResourceType, Integer> chooseTypeIds() {
// Go through public entries. Those may have forced certain type assignments, so take those
