Adds a build_tools_version attribute to the android_sdk rule so that the android

build tools version can be used to determine which features to use.

--
MOS_MIGRATED_REVID=114225514

1 files changed, 5 insertions, 0 deletions

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 8904b22e68..2d61a18cba 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
@@ -22,8 +22,10 @@ import com.google.devtools.build.lib.analysis.RuleContext;
 import com.google.devtools.build.lib.analysis.RunfilesProvider;
 import com.google.devtools.build.lib.collect.nestedset.NestedSetBuilder;
 import com.google.devtools.build.lib.collect.nestedset.Order;
+import com.google.devtools.build.lib.packages.AggregatingAttributeMapper;
 import com.google.devtools.build.lib.rules.RuleConfiguredTargetFactory;
 import com.google.devtools.build.lib.rules.java.JavaConfiguration;
+import com.google.devtools.build.lib.syntax.Type;
 
 /**
  * Implementation of the {@code android_sdk} rule.
@@ -38,6 +40,8 @@ public class AndroidSdk implements RuleConfiguredTargetFactory {
             ? ruleContext.getExecutablePrerequisite("proguard", Mode.HOST)
             : ruleContext.getExecutablePrerequisite(":proguard", Mode.HOST);
 
+    String buildToolsVersion = AggregatingAttributeMapper.of(ruleContext.getRule())
+        .get("build_tools_version", Type.STRING);
     FilesToRunProvider aidl = ruleContext.getExecutablePrerequisite("aidl", Mode.HOST);
     FilesToRunProvider aapt = ruleContext.getExecutablePrerequisite("aapt", Mode.HOST);
     FilesToRunProvider apkBuilder = ruleContext.getExecutablePrerequisite(
@@ -67,6 +71,7 @@ public class AndroidSdk implements RuleConfiguredTargetFactory {
         .add(
             AndroidSdkProvider.class,
             new AndroidSdkProvider(
+                buildToolsVersion,
                 frameworkAidl,
                 androidJar,
                 shrinkedAndroidJar,