diff options
| author |  Alex Humesky <ahumesky@google.com> | 2015-05-26 22:23:13 +0000 |
|---|---|---|
| committer |  Laurent Le Brun <laurentlb@google.com> | 2015-05-27 16:46:05 +0000 |
| commit | b46c6351321c2950badb4c0e4071e3f20d49e338 (patch) | |
| tree | 59710d4c8b959c1aa1ac093b1311e905745c03e9 /src/main/java/com | |
| parent | b2053d796acf4c1bc39ddc56769be22a9e09c0da (diff) | |
Adds tools for building Android apps.
--
MOS_MIGRATED_REVID=94515805
Diffstat (limited to 'src/main/java/com')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/android/AndroidLibraryBaseRule.java | 2 | ||||
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/android/AndroidRuleClasses.java | 2 |
2 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 81f50156fc..0d3ebb8fd1 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 @@ -150,7 +150,7 @@ public final class AndroidLibraryBaseRule implements RuleDefinition { @Override public Object getDefault(AttributeMap rule) { return rule.isAttributeValueExplicitlySpecified("proguard_specs") - ? env.getLabel("//tools/android/build:proguard_whitelister") + ? env.getLabel("//tools/android:proguard_whitelister") : null; } })) 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 d428a92432..6664288934 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 @@ -109,7 +109,7 @@ public final class AndroidRuleClasses { public static final SafeImplicitOutputsFunction JAVA_RESOURCES_JAR = fromTemplates("%{name}_files/java_resources.jar"); public static final String MANIFEST_MERGE_TOOL_LABEL = - "//tools/android/build:merge_manifests.par"; + "//tools/android:merge_manifests"; public static final String BUILD_INCREMENTAL_DEXMANIFEST_LABEL = "//tools/android:build_incremental_dexmanifest"; public static final String STUBIFY_MANIFEST_LABEL = "//tools/android:stubify_manifest"; |