diff options
| author |  Ulf Adams <ulfjack@google.com> | 2015-09-01 18:11:07 +0000 |
|---|---|---|
| committer |  John Field <jfield@google.com> | 2015-09-02 00:58:29 +0000 |
| commit | 4ac3c22a43cd1a6d5dccb84f7a43776c75ba6869 (patch) | |
| tree | 30c9a19bd993291a2f0d0f9a6dee9204521b1d3a /src/main/java/com/google/devtools/build | |
| parent | dd2918b260da011551bb3827fba12047e5321a64 (diff) | |
Annotate Bazel Android rules, which I missed earlier.
--
MOS_MIGRATED_REVID=102059868
Diffstat (limited to 'src/main/java/com/google/devtools/build')
2 files changed, 9 insertions, 0 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/bazel/rules/android/BazelAndroidBinaryRule.java b/src/main/java/com/google/devtools/build/lib/bazel/rules/android/BazelAndroidBinaryRule.java index 69c7ac142b..54a2e531ad 100644 --- a/src/main/java/com/google/devtools/build/lib/bazel/rules/android/BazelAndroidBinaryRule.java +++ b/src/main/java/com/google/devtools/build/lib/bazel/rules/android/BazelAndroidBinaryRule.java @@ -23,7 +23,10 @@ import com.google.devtools.build.lib.packages.RuleClass; import com.google.devtools.build.lib.packages.RuleClass.Builder; import com.google.devtools.build.lib.packages.Type; import com.google.devtools.build.lib.rules.android.AndroidBinaryOnlyRule; +import com.google.devtools.build.lib.rules.android.AndroidConfiguration; import com.google.devtools.build.lib.rules.android.AndroidRuleClasses; +import com.google.devtools.build.lib.rules.cpp.CppConfiguration; +import com.google.devtools.build.lib.rules.java.JavaConfiguration; /** * Rule class definition for {@code android_binary}. @@ -33,6 +36,8 @@ public class BazelAndroidBinaryRule implements RuleDefinition { @Override public RuleClass build(Builder builder, RuleDefinitionEnvironment environment) { return builder + .requiresConfigurationFragments( + AndroidConfiguration.class, JavaConfiguration.class, CppConfiguration.class) .add(attr(":cc_toolchain_split", Type.LABEL) .cfg(AndroidRuleClasses.ANDROID_SPLIT_TRANSITION) .value(BazelCppRuleClasses.CC_TOOLCHAIN)) diff --git a/src/main/java/com/google/devtools/build/lib/bazel/rules/android/BazelAndroidLibraryRule.java b/src/main/java/com/google/devtools/build/lib/bazel/rules/android/BazelAndroidLibraryRule.java index 6a6c79e9fa..bf7da9c983 100644 --- a/src/main/java/com/google/devtools/build/lib/bazel/rules/android/BazelAndroidLibraryRule.java +++ b/src/main/java/com/google/devtools/build/lib/bazel/rules/android/BazelAndroidLibraryRule.java @@ -19,8 +19,10 @@ import com.google.devtools.build.lib.analysis.RuleDefinitionEnvironment; import com.google.devtools.build.lib.bazel.rules.java.BazelJavaRuleClasses; import com.google.devtools.build.lib.packages.RuleClass; import com.google.devtools.build.lib.packages.RuleClass.Builder; +import com.google.devtools.build.lib.rules.android.AndroidConfiguration; import com.google.devtools.build.lib.rules.android.AndroidLibraryBaseRule; import com.google.devtools.build.lib.rules.android.AndroidRuleClasses; +import com.google.devtools.build.lib.rules.java.JavaConfiguration; /** * Definition of the {@code android_library} rule for Bazel. @@ -30,6 +32,8 @@ public class BazelAndroidLibraryRule implements RuleDefinition { @Override public RuleClass build(Builder builder, RuleDefinitionEnvironment env) { return builder + .requiresConfigurationFragments( + JavaConfiguration.class, AndroidConfiguration.class) /* <!-- #BLAZE_RULE(android_library).IMPLICIT_OUTPUTS --> <ul> <li><code>lib<var>name</var>.jar</code>: A Java archive.</li> |