diff options
author | ajmichael <ajmichael@google.com> | 2017-10-24 17:11:26 +0200 |
---|---|---|
committer | Dmitry Lomov <dslomov@google.com> | 2017-10-25 16:45:18 +0200 |
commit | 69f5849daaa18b79d37fb9b57e32686688b36dd4 (patch) | |
tree | ed456638b9e726fa6e1de3b090acd844be3dcf77 /src/main/java | |
parent | 88157011af4ddac21e404e9deea0d78668a71a99 (diff) |
Add unused, optional source_properties attribute to android_sdk.
RELNOTES: None
PiperOrigin-RevId: 173258794
Diffstat (limited to 'src/main/java')
3 files changed, 9 insertions, 0 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 2e58a19123..d1c6ed2d02 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 @@ -414,6 +414,8 @@ public final class AndroidRuleClasses { .add(attr("aidl", LABEL).mandatory().cfg(HOST).allowedFileTypes(ANY_FILE).exec()) .add(attr("aidl_lib", LABEL).allowedFileTypes(JavaSemantics.JAR)) .add(attr("android_jar", LABEL).mandatory().cfg(HOST).allowedFileTypes(JavaSemantics.JAR)) + // TODO(b/67903726): Make this attribute mandatory after updating all android_sdk rules. + .add(attr("source_properties", LABEL).cfg(HOST).allowedFileTypes(ANY_FILE)) .add(attr("shrinked_android_jar", LABEL).mandatory().cfg(HOST).allowedFileTypes(ANY_FILE)) .add(attr("annotations_jar", LABEL).mandatory().cfg(HOST).allowedFileTypes(ANY_FILE)) .add(attr("main_dex_classes", LABEL).mandatory().cfg(HOST).allowedFileTypes(ANY_FILE)) diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidSdk.java b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidSdk.java index b2915acbd2..d44353e5e9 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidSdk.java +++ b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidSdk.java @@ -59,6 +59,7 @@ public class AndroidSdk implements RuleConfiguredTargetFactory { Artifact frameworkAidl = ruleContext.getPrerequisiteArtifact("framework_aidl", Mode.HOST); TransitiveInfoCollection aidlLib = ruleContext.getPrerequisite("aidl_lib", Mode.TARGET); Artifact androidJar = ruleContext.getPrerequisiteArtifact("android_jar", Mode.HOST); + Artifact sourceProperties = ruleContext.getHostPrerequisiteArtifact("source_properties"); Artifact shrinkedAndroidJar = ruleContext.getPrerequisiteArtifact("shrinked_android_jar", Mode.HOST); Artifact annotationsJar = ruleContext.getPrerequisiteArtifact("annotations_jar", Mode.HOST); @@ -76,6 +77,7 @@ public class AndroidSdk implements RuleConfiguredTargetFactory { frameworkAidl, aidlLib, androidJar, + sourceProperties, shrinkedAndroidJar, annotationsJar, mainDexClasses, diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidSdkProvider.java b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidSdkProvider.java index 65b27f6f32..2b662a9b1f 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidSdkProvider.java +++ b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidSdkProvider.java @@ -33,6 +33,7 @@ public abstract class AndroidSdkProvider implements TransitiveInfoProvider { Artifact frameworkAidl, @Nullable TransitiveInfoCollection aidlLib, Artifact androidJar, + @Nullable Artifact sourceProperties, Artifact shrinkedAndroidJar, Artifact annotationsJar, Artifact mainDexClasses, @@ -52,6 +53,7 @@ public abstract class AndroidSdkProvider implements TransitiveInfoProvider { frameworkAidl, aidlLib, androidJar, + sourceProperties, shrinkedAndroidJar, annotationsJar, mainDexClasses, @@ -103,6 +105,9 @@ public abstract class AndroidSdkProvider implements TransitiveInfoProvider { public abstract Artifact getAndroidJar(); + @Nullable + public abstract Artifact getSourceProperties(); + public abstract Artifact getShrinkedAndroidJar(); public abstract Artifact getAnnotationsJar(); |