Expose test "data" attribute to IDE.

This is needed to deploy android_tests to the device for testing. For
symmetry we expose it for all tests rules.

--
MOS_MIGRATED_REVID=129918247

2 files changed, 19 insertions, 0 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/ideinfo/AndroidStudioInfoAspect.java b/src/main/java/com/google/devtools/build/lib/ideinfo/AndroidStudioInfoAspect.java
index 8f29d09ae8..12c47a9dab 100644
--- a/src/main/java/com/google/devtools/build/lib/ideinfo/AndroidStudioInfoAspect.java
+++ b/src/main/java/com/google/devtools/build/lib/ideinfo/AndroidStudioInfoAspect.java
@@ -386,6 +386,10 @@ public class AndroidStudioInfoAspect extends NativeAspectClass implements Config
       if (attr != null) {
         builder.setSize(attr);
       }
+      Collection<Artifact> data = getDataListAttribute(ruleContext, "data");
+      for (Artifact artifact : data) {
+        builder.addData(makeArtifactLocation(artifact));
+      }
       outputBuilder.setTestInfo(builder);
     }
 
@@ -797,6 +801,20 @@ public class AndroidStudioInfoAspect extends NativeAspectClass implements Config
     return getStringListAttribute(ruleContext, "copts");
   }
 
+  private static boolean hasDataModeAttribute(RuleContext ruleContext,
+      String attributeName, Type<?> type) {
+    return ruleContext.attributes().has(attributeName, type)
+        && ruleContext.getAttributeMode(attributeName) == Mode.DATA;
+  }
+
+  private static Collection<Artifact> getDataListAttribute(RuleContext ruleContext,
+      String attributeName) {
+    return hasDataModeAttribute(ruleContext, attributeName, BuildType.LABEL_LIST)
+        ? ruleContext.getPrerequisiteArtifacts(attributeName, Mode.DATA).list()
+        : ImmutableList.<Artifact>of();
+  }
+
+
   private static Collection<Artifact> getTargetListAttribute(RuleContext ruleContext,
       String attributeName) {
     return (ruleContext.attributes().has(attributeName, BuildType.LABEL_LIST)
diff --git a/src/main/protobuf/android_studio_ide_info.proto b/src/main/protobuf/android_studio_ide_info.proto
index 07c86a53e0..1a65ac8456 100644
--- a/src/main/protobuf/android_studio_ide_info.proto
+++ b/src/main/protobuf/android_studio_ide_info.proto
@@ -100,6 +100,7 @@ message ProtoLibraryLegacyJavaIdeInfo {
 
 message TestInfo {
   string size = 1;
+  repeated ArtifactLocation data = 2;
 }
 
 message JavaToolchainIdeInfo {