From 05e2c5b4e0da2f88e12d95adbc63cc3d46a6fca6 Mon Sep 17 00:00:00 2001 From: Lukacs Berki Date: Mon, 7 Sep 2015 14:04:35 +0000 Subject: Remove references to the legacy android_resources rule from the Bazel BUILD encyclopedia. Fixes #426. -- MOS_MIGRATED_REVID=102496247 --- .../build/lib/rules/android/AndroidBinaryOnlyRule.java | 7 ------- .../build/lib/rules/android/AndroidLibraryBaseRule.java | 11 ----------- 2 files changed, 18 deletions(-) (limited to 'src/main/java/com/google/devtools/build/lib/rules/android') diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidBinaryOnlyRule.java b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidBinaryOnlyRule.java index 4056c784cf..52779882b9 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidBinaryOnlyRule.java +++ b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidBinaryOnlyRule.java @@ -88,13 +88,6 @@ public final class AndroidBinaryOnlyRule implements RuleDefinition { the specified screen densities, to reduce APK size. */ .add(attr("densities", STRING_LIST)) - /* - The android_resources target corresponding to this binary. - ${SYNOPSIS} - The target describing the manifest, resources and assets used by this - binary. - */ - .add(attr("resources", LABEL).allowedFileTypes().allowedRuleClasses("android_resources")) .add(attr("$android_manifest_merge_tool", LABEL) .cfg(HOST) .exec() 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 1cb6a45697..551798eeca 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 @@ -82,17 +82,6 @@ public final class AndroidLibraryBaseRule implements RuleDefinition { .override(builder.copy("deps") .allowedRuleClasses(AndroidRuleClasses.ALLOWED_DEPENDENCIES) .allowedFileTypes()) - /* - The android_resources target assigned to this library. - ${SYNOPSIS} - If specified, the resources will be added to any android_binary - depending on this library. -

Only an android_resource rule with the attribute - inline_constants set to 0 can be used in this case.

- */ - .add(attr("resources", LABEL) - .allowedFileTypes() - .allowedRuleClasses("android_resources")) .add(attr("alwayslink", BOOLEAN).undocumented("purely informational for now")) /* Only use this library for compilation and not at runtime. -- cgit v1.2.3