diff options
| author |  Luis Fernando Pino Duque <lpino@google.com> | 2016-02-08 14:55:28 +0000 |
|---|---|---|
| committer |  Dmitry Lomov <dslomov@google.com> | 2016-02-09 12:16:47 +0000 |
| commit | 18d1322aa35625f87573e241153acd33509028a7 (patch) | |
| tree | 1ae635fda346fab30d906b119f7236c315694e3c /src/main/java/com/google/devtools/build/lib/rules/android/AndroidLibraryBaseRule.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/android/AndroidLibraryBaseRule.java')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/android/AndroidLibraryBaseRule.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidLibraryBaseRule.java b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidLibraryBaseRule.java index e385c3c39f..f1877165ee 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidLibraryBaseRule.java +++ b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidLibraryBaseRule.java @@ -125,8 +125,8 @@ public final class AndroidLibraryBaseRule implements RuleDefinition { <!-- #END_BLAZE_RULE.ATTRIBUTE --> */ .add(attr("idl_parcelables", LABEL_LIST).direct_compile_time_input() .allowedFileTypes(AndroidRuleClasses.ANDROID_IDL)) - .add(attr("$android_manifest_merge_tool", LABEL).cfg(HOST).exec().value(env.getLabel( - env.getToolsRepository() + AndroidRuleClasses.MANIFEST_MERGE_TOOL_LABEL))) + .add(attr("$android_manifest_merge_tool", LABEL).cfg(HOST).exec().value( + env.getToolsLabel(AndroidRuleClasses.MANIFEST_MERGE_TOOL_LABEL))) .advertiseProvider(JavaCompilationArgsProvider.class) .build(); } |