aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/main/java/com/google/devtools/build/lib/rules/android
diff options
context:
space:
mode:
authorGravatar Lukacs Berki <lberki@google.com>2016-04-19 10:22:08 +0000
committerGravatar Damien Martin-Guillerez <dmarting@google.com>2016-04-19 13:51:02 +0000
commit0dbe07f017d391aba0613b4e6ca1503b62382ccd (patch)
tree2381fd857c3d5a029848c5f90f44fe5d9f8b3b36 /src/main/java/com/google/devtools/build/lib/rules/android
parent97e5ab037ff54738e7f3995ec1834b619406fb17 (diff)
Rename LateBoundLabel#getDefault(Rule, AttributeMap, T) to #resolve().
Its old name was confusing because resolve() and getDefault() do radically different things: getDefault() returns a good enough lie for when BuildConfiguration is not available, and resolve() resolves the dependency when we do have a BuildConfiguration. -- MOS_MIGRATED_REVID=120212630
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/rules/android')
-rw-r--r--src/main/java/com/google/devtools/build/lib/rules/android/AndroidRuleClasses.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidRuleClasses.java b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidRuleClasses.java
index e3e10c72a2..f93487feb9 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidRuleClasses.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidRuleClasses.java
@@ -171,7 +171,7 @@ public final class AndroidRuleClasses {
public static final LateBoundLabel<BuildConfiguration> ANDROID_SDK =
new LateBoundLabel<BuildConfiguration>(DEFAULT_ANDROID_SDK, AndroidConfiguration.class) {
@Override
- public Label getDefault(Rule rule, AttributeMap attributes,
+ public Label resolve(Rule rule, AttributeMap attributes,
BuildConfiguration configuration) {
return configuration.getFragment(AndroidConfiguration.class).getSdk();
}