diff options
| author |  Lukacs Berki <lberki@google.com> | 2015-07-02 10:52:13 +0000 |
|---|---|---|
| committer |  Florian Weikert <fwe@google.com> | 2015-07-02 11:27:02 +0000 |
| commit | 254b3952336488fe3f1eaa8942b3eb1ec90f616e (patch) | |
| tree | 437c9899a54296189488a9f0f32ba80852bcbc5c /src | |
| parent | f2b1fd6ac367b616a13c3426193e32ad3aae929b (diff) | |
Do not load any Android tool unconditionally. We are loading them now as vanilla implicit dependencies (and not configuration-dependent ones).
Fixes #249.
--
MOS_MIGRATED_REVID=97407144
Diffstat (limited to 'src')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/android/AndroidConfiguration.java | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidConfiguration.java b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidConfiguration.java index e7892bcd2c..f54c3ae00b 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidConfiguration.java +++ b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidConfiguration.java @@ -114,13 +114,6 @@ public class AndroidConfiguration extends BuildConfiguration.Fragment { } labelMap.put("android_sdk", realSdk()); - - labelMap.put("android_incremental_stub_application", - AndroidRuleClasses.DEFAULT_INCREMENTAL_STUB_APPLICATION); - labelMap.put("android_incremental_split_stub_application", - AndroidRuleClasses.DEFAULT_INCREMENTAL_SPLIT_STUB_APPLICATION); - labelMap.put("android_resources_processor", AndroidRuleClasses.DEFAULT_RESOURCES_PROCESSOR); - labelMap.put("android_aar_generator", AndroidRuleClasses.DEFAULT_AAR_GENERATOR); } // This method is here because Constants.ANDROID_DEFAULT_SDK cannot be a constant, because we |