From 18d1322aa35625f87573e241153acd33509028a7 Mon Sep 17 00:00:00 2001 From: Luis Fernando Pino Duque Date: Mon, 8 Feb 2016 14:55:28 +0000 Subject: Replace getToolsRepository() with getToolsLabel(String labelValue) which prepends the tools repository path to the given string and parses the result as a label. This is a cleaner way to access the tools repository label. -- MOS_MIGRATED_REVID=114105929 --- .../google/devtools/build/lib/rules/objc/ObjcProtoLibraryRule.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/main/java/com/google/devtools/build/lib/rules/objc/ObjcProtoLibraryRule.java') diff --git a/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcProtoLibraryRule.java b/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcProtoLibraryRule.java index 598edcf575..fc5a9e6e7b 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcProtoLibraryRule.java +++ b/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcProtoLibraryRule.java @@ -76,11 +76,11 @@ public class ObjcProtoLibraryRule implements RuleDefinition { .allowedFileTypes(FileType.of(".py")) .cfg(HOST) .singleArtifact() - .value(env.getLabel(env.getToolsRepository() + "//tools/objc:compile_protos"))) + .value(env.getToolsLabel("//tools/objc:compile_protos"))) .add(attr(PROTO_SUPPORT_ATTR, LABEL) .legacyAllowAnyFileType() .cfg(HOST) - .value(env.getLabel(env.getToolsRepository() + "//tools/objc:proto_support"))) + .value(env.getToolsLabel("//tools/objc:proto_support"))) .add(attr(USE_OBJC_HEADER_NAMES_ATTR, BOOLEAN).value(false)) .add(attr(LIBPROTOBUF_ATTR, LABEL).allowedRuleClasses("objc_library") .value(new ComputedDefault(OUTPUT_CPP_ATTR) { @@ -92,7 +92,7 @@ public class ObjcProtoLibraryRule implements RuleDefinition { } })) .add(attr("$xcodegen", LABEL).cfg(HOST).exec() - .value(env.getLabel(env.getToolsRepository() + "//tools/objc:xcodegen"))) + .value(env.getToolsLabel("//tools/objc:xcodegen"))) .build(); } -- cgit v1.2.3