From 38a8341a4cf5877ddbab6145829a0271cbe9fe50 Mon Sep 17 00:00:00 2001 From: Luis Fernando Pino Duque Date: Wed, 3 Feb 2016 14:04:13 +0000 Subject: Replace occurrences of Constants.TOOLS_REPOSITORY in places where it can be referenced via the rule class provider (using the RuleDefinitionEnvironment). This is the second phase of the removal of the TOOLS_REPOSITORY constants. -- MOS_MIGRATED_REVID=113734334 --- .../build/lib/rules/objc/ObjcRuleClasses.java | 31 +++++++++++----------- 1 file changed, 15 insertions(+), 16 deletions(-) (limited to 'src/main/java/com/google/devtools/build/lib/rules/objc/ObjcRuleClasses.java') diff --git a/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcRuleClasses.java b/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcRuleClasses.java index 23acbd12ad..4f1cd369b9 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcRuleClasses.java +++ b/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcRuleClasses.java @@ -26,7 +26,6 @@ import com.google.common.annotations.VisibleForTesting; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; -import com.google.devtools.build.lib.Constants; import com.google.devtools.build.lib.actions.Artifact; import com.google.devtools.build.lib.analysis.BaseRuleClasses; import com.google.devtools.build.lib.analysis.RuleConfiguredTarget.Mode; @@ -513,15 +512,15 @@ public class ObjcRuleClasses { public RuleClass build(Builder builder, RuleDefinitionEnvironment env) { return builder .add(attr("$plmerge", LABEL).cfg(HOST).exec() - .value(env.getLabel(Constants.TOOLS_REPOSITORY + "//tools/objc:plmerge"))) + .value(env.getLabel(env.getToolsRepository() + "//tools/objc:plmerge"))) .add(attr("$actoolwrapper", LABEL).cfg(HOST).exec() - .value(env.getLabel(Constants.TOOLS_REPOSITORY + "//tools/objc:actoolwrapper"))) + .value(env.getLabel(env.getToolsRepository() + "//tools/objc:actoolwrapper"))) .add(attr("$ibtoolwrapper", LABEL).cfg(HOST).exec() - .value(env.getLabel(Constants.TOOLS_REPOSITORY + "//tools/objc:ibtoolwrapper"))) + .value(env.getLabel(env.getToolsRepository() + "//tools/objc:ibtoolwrapper"))) // TODO(dmaclach): Adding realpath here should not be required once // https://github.com/bazelbuild/bazel/issues/285 is fixed. .add(attr("$realpath", LABEL).cfg(HOST).exec() - .value(env.getLabel(Constants.TOOLS_REPOSITORY + "//tools/objc:realpath"))) + .value(env.getLabel(env.getToolsRepository() + "//tools/objc:realpath"))) .build(); } @Override @@ -541,9 +540,9 @@ public class ObjcRuleClasses { public RuleClass build(Builder builder, RuleDefinitionEnvironment env) { return builder .add(attr("$xcodegen", LABEL).cfg(HOST).exec() - .value(env.getLabel(Constants.TOOLS_REPOSITORY + "//tools/objc:xcodegen"))) + .value(env.getLabel(env.getToolsRepository() + "//tools/objc:xcodegen"))) .add(attr("$dummy_source", LABEL) - .value(env.getLabel(Constants.TOOLS_REPOSITORY + "//tools/objc:dummy.c"))) + .value(env.getLabel(env.getToolsRepository() + "//tools/objc:dummy.c"))) .build(); } @Override @@ -760,14 +759,14 @@ public class ObjcRuleClasses { .add(attr("$dumpsyms", LABEL) .cfg(HOST) .singleArtifact() - .value(env.getLabel(Constants.TOOLS_REPOSITORY + "//tools/objc:dump_syms"))) + .value(env.getLabel(env.getToolsRepository() + "//tools/objc:dump_syms"))) .add(attr("$j2objc_dead_code_pruner", LABEL) .allowedFileTypes(FileType.of(".py")) .cfg(HOST) .exec() .singleArtifact() .value(env.getLabel( - Constants.TOOLS_REPOSITORY + "//tools/objc:j2objc_dead_code_pruner"))) + env.getToolsRepository() + "//tools/objc:j2objc_dead_code_pruner"))) .build(); } @Override @@ -833,14 +832,14 @@ public class ObjcRuleClasses { attr("$momcwrapper", LABEL) .cfg(HOST) .exec() - .value(env.getLabel(Constants.TOOLS_REPOSITORY + "//tools/objc:momcwrapper"))) + .value(env.getLabel(env.getToolsRepository() + "//tools/objc:momcwrapper"))) .add( attr("$swiftstdlibtoolwrapper", LABEL) .cfg(HOST) .exec() .value( env.getLabel( - Constants.TOOLS_REPOSITORY + "//tools/objc:swiftstdlibtoolwrapper"))) + env.getToolsRepository() + "//tools/objc:swiftstdlibtoolwrapper"))) .build(); } @@ -978,13 +977,13 @@ public class ObjcRuleClasses { attr("$bundlemerge", LABEL) .cfg(HOST) .exec() - .value(env.getLabel(Constants.TOOLS_REPOSITORY + "//tools/objc:bundlemerge"))) + .value(env.getLabel(env.getToolsRepository() + "//tools/objc:bundlemerge"))) .add( attr("$environment_plist_sh", LABEL) .cfg(HOST) .value( env.getLabel( - Constants.TOOLS_REPOSITORY + "//tools/objc:environment_plist.sh"))) + env.getToolsRepository() + "//tools/objc:environment_plist.sh"))) .build(); } @Override @@ -1006,9 +1005,9 @@ public class ObjcRuleClasses { return builder // Needed to run the binary in the simulator. .add(attr("$iossim", LABEL).cfg(HOST).exec() - .value(env.getLabel(Constants.TOOLS_REPOSITORY + "//third_party/iossim:iossim"))) + .value(env.getLabel(env.getToolsRepository() + "//third_party/iossim:iossim"))) .add(attr("$std_redirect_dylib", LABEL).cfg(HOST).exec() - .value(env.getLabel(Constants.TOOLS_REPOSITORY + "//tools/objc:StdRedirect.dylib"))) + .value(env.getLabel(env.getToolsRepository() + "//tools/objc:StdRedirect.dylib"))) .build(); } @Override @@ -1028,7 +1027,7 @@ public class ObjcRuleClasses { public RuleClass build(Builder builder, RuleDefinitionEnvironment env) { return builder .add(attr("$xcrunwrapper", LABEL).cfg(HOST).exec() - .value(env.getLabel(Constants.TOOLS_REPOSITORY + "//tools/objc:xcrunwrapper"))) + .value(env.getLabel(env.getToolsRepository() + "//tools/objc:xcrunwrapper"))) .build(); } @Override -- cgit v1.2.3