diff options
| author |  Ulf Adams <ulfjack@google.com> | 2015-08-28 12:49:08 +0000 |
|---|---|---|
| committer |  John Field <jfield@google.com> | 2015-08-28 15:00:27 +0000 |
| commit | 866917ffa08e425086fa3125b67ccdb883cd2d62 (patch) | |
| tree | fdbebdf0d1fd0d9c27a2439b91846ac97563f4d2 /src/main | |
| parent | f608b72f4f037371aff94365714ee8cc56a5f412 (diff) | |
Inline Constants.IOS_DEVICE_RULE_CLASSES.
--
MOS_MIGRATED_REVID=101769828
Diffstat (limited to 'src/main')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/Constants.java | 5 | ||||
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/objc/ExperimentalIosTestRule.java | 3 |
2 files changed, 1 insertions, 7 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/Constants.java b/src/main/java/com/google/devtools/build/lib/Constants.java index 7787f47002..9f9d2f96c8 100644 --- a/src/main/java/com/google/devtools/build/lib/Constants.java +++ b/src/main/java/com/google/devtools/build/lib/Constants.java @@ -43,11 +43,6 @@ public class Constants { public static final ImmutableList<String> BASELINE_COVERAGE_OFFLINE_INSTRUMENTATION_SUFFIXES = ImmutableList.<String>of(); - /** - * Rule classes which specify iOS devices for running tests. - */ - public static final ImmutableSet<String> IOS_DEVICE_RULE_CLASSES = ImmutableSet.of("ios_device"); - public static final String ANDROID_DEFAULT_SDK = "//external:android/sdk".toString(); public static final String ANDROID_DEFAULT_CROSSTOOL = "//external:android/crosstool".toString(); public static final ImmutableList<String> ANDROID_DEFAULT_FAT_APK_CPUS = diff --git a/src/main/java/com/google/devtools/build/lib/rules/objc/ExperimentalIosTestRule.java b/src/main/java/com/google/devtools/build/lib/rules/objc/ExperimentalIosTestRule.java index 8e1cbe57b1..886039760b 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/objc/ExperimentalIosTestRule.java +++ b/src/main/java/com/google/devtools/build/lib/rules/objc/ExperimentalIosTestRule.java @@ -21,7 +21,6 @@ import static com.google.devtools.build.lib.packages.Type.LABEL_LIST; import static com.google.devtools.build.lib.packages.Type.STRING_LIST; import com.google.common.collect.ImmutableList; -import com.google.devtools.build.lib.Constants; import com.google.devtools.build.lib.analysis.BaseRuleClasses; import com.google.devtools.build.lib.analysis.RuleDefinition; import com.google.devtools.build.lib.analysis.RuleDefinitionEnvironment; @@ -62,7 +61,7 @@ public final class ExperimentalIosTestRule implements RuleDefinition { .override( attr(IosTest.TARGET_DEVICE, LABEL) .allowedFileTypes() - .allowedRuleClasses(Constants.IOS_DEVICE_RULE_CLASSES) + .allowedRuleClasses("ios_device") .value(env.getLabel("//tools/objc/sim_devices:default"))) /* <!-- #BLAZE_RULE(experimental_ios_test).ATTRIBUTE(ios_test_target_device) --> The device against how to run the test. If this attribute is defined, the test will run on |