aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar Googler <noreply@google.com>2017-03-03 01:28:17 +0000
committerGravatar Yue Gan <yueg@google.com>2017-03-03 10:39:02 +0000
commitdfffa11c5b5869f4a5f410512389cd28a158800f (patch)
treece997a905de43802248dec5783f9e5697f108e46
parent79fbcd2f1a657e90ed7345e821146f6ad96566f1 (diff)
Global cleanup change.
-- PiperOrigin-RevId: 149067322 MOS_MIGRATED_REVID=149067322
-rw-r--r--src/main/java/com/google/devtools/build/lib/rules/objc/J2ObjcLibrary.java7
-rw-r--r--src/test/java/com/google/devtools/build/lib/exec/util/TestExecutorBuilder.java4
2 files changed, 4 insertions, 7 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/objc/J2ObjcLibrary.java b/src/main/java/com/google/devtools/build/lib/rules/objc/J2ObjcLibrary.java
index eda1d6a11e..451af68adf 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/objc/J2ObjcLibrary.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/objc/J2ObjcLibrary.java
@@ -32,7 +32,6 @@ import com.google.devtools.build.lib.packages.RuleClass.ConfiguredTargetFactory.
import com.google.devtools.build.lib.rules.RuleConfiguredTargetFactory;
import com.google.devtools.build.lib.syntax.Type;
import com.google.devtools.build.lib.vfs.PathFragment;
-
import java.util.List;
/**
@@ -46,10 +45,8 @@ public class J2ObjcLibrary implements RuleConfiguredTargetFactory {
"Entry classes must be specified when flag --compilationMode=opt is on in order to"
+ " perform J2ObjC dead code stripping.";
- public static final List<String> J2OBJC_SUPPORTED_RULES = ImmutableList.of(
- "java_import",
- "java_library",
- "proto_library");
+ public static final ImmutableList<String> J2OBJC_SUPPORTED_RULES =
+ ImmutableList.of("java_import", "java_library", "proto_library");
@Override
public ConfiguredTarget create(RuleContext ruleContext)
diff --git a/src/test/java/com/google/devtools/build/lib/exec/util/TestExecutorBuilder.java b/src/test/java/com/google/devtools/build/lib/exec/util/TestExecutorBuilder.java
index d18e004570..698a860e3d 100644
--- a/src/test/java/com/google/devtools/build/lib/exec/util/TestExecutorBuilder.java
+++ b/src/test/java/com/google/devtools/build/lib/exec/util/TestExecutorBuilder.java
@@ -42,8 +42,8 @@ import java.util.TreeMap;
* Builder for the test instance of the {@link BlazeExecutor} class.
*/
public class TestExecutorBuilder {
- public static final List<Class<? extends OptionsBase>> DEFAULT_OPTIONS = ImmutableList.of(
- ExecutionOptions.class, CommonCommandOptions.class);
+ public static final ImmutableList<Class<? extends OptionsBase>> DEFAULT_OPTIONS =
+ ImmutableList.of(ExecutionOptions.class, CommonCommandOptions.class);
private final BlazeDirectories directories;
private EventBus bus = new EventBus();
private Reporter reporter = new Reporter(bus);