Rollback of commit fbaa700337bf0cf9083f083e6cd0d2f82faf1506.

*** Reason for rollback ***

I want to do this in a way that exposes the data attribute only for android_test and android_binary, so I'll add it to the deploy manifest instead.

*** Original change description ***

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=129926351

2 files changed, 0 insertions, 19 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 12c47a9dab..8f29d09ae8 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,10 +386,6 @@ 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);
     }
 
@@ -801,20 +797,6 @@ 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 1a65ac8456..07c86a53e0 100644
--- a/src/main/protobuf/android_studio_ide_info.proto
+++ b/src/main/protobuf/android_studio_ide_info.proto
@@ -100,7 +100,6 @@ message ProtoLibraryLegacyJavaIdeInfo {
 
 message TestInfo {
   string size = 1;
-  repeated ArtifactLocation data = 2;
 }
 
 message JavaToolchainIdeInfo {