Support android_test in AndroidStudioInfoAspect.

This requires splitting out the tests into some
Google-specific ones.

--
MOS_MIGRATED_REVID=104365566

1 files changed, 5 insertions, 1 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 dfab1955c0..17271211bb 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
@@ -204,7 +204,9 @@ public class AndroidStudioInfoAspect implements ConfiguredAspectFactory {
         || ruleKind == Kind.JAVA_TEST
         || ruleKind == Kind.JAVA_BINARY) {
       outputBuilder.setJavaRuleIdeInfo(makeJavaRuleIdeInfo(base));
-    } else if (ruleKind == Kind.ANDROID_LIBRARY || ruleKind == Kind.ANDROID_BINARY) {
+    } else if (ruleKind == Kind.ANDROID_LIBRARY
+        || ruleKind == Kind.ANDROID_BINARY
+        || ruleKind == Kind.ANDROID_TEST) {
       outputBuilder.setJavaRuleIdeInfo(makeJavaRuleIdeInfo(base));
       outputBuilder.setAndroidRuleIdeInfo(
           makeAndroidRuleIdeInfo(ruleContext, base, providerBuilder));
@@ -448,6 +450,8 @@ public class AndroidStudioInfoAspect implements ConfiguredAspectFactory {
         return Kind.ANDROID_LIBRARY;
       case "android_binary":
         return Kind.ANDROID_BINARY;
+      case "android_test":
+        return Kind.ANDROID_TEST;
       default:
         {
           if (base.getProvider(AndroidSdkProvider.class) != null) {