diff options
author | 2016-02-08 14:55:28 +0000 | |
---|---|---|
committer | 2016-02-09 12:16:47 +0000 | |
commit | 18d1322aa35625f87573e241153acd33509028a7 (patch) | |
tree | 1ae635fda346fab30d906b119f7236c315694e3c /src/main/java/com/google/devtools/build/lib/rules/objc/ObjcProtoLibraryRule.java | |
parent | 552e3e40658e689881d44d69ed8ffcd6c45ae995 (diff) |
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
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/rules/objc/ObjcProtoLibraryRule.java')
-rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/objc/ObjcProtoLibraryRule.java | 6 |
1 files changed, 3 insertions, 3 deletions
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(); } |