commit 254ffa8c56643c42af6b6c6e123d90ad80083c8f
author Googler <noreply@google.com> Thu Oct 01 08:43:03 2015 +0000
committer David Chen <dzc@google.com> Thu Oct 01 12:17:25 2015 +0000
tree 4c34f9db2d2976106ff3905ff7ec0b91cbc2c637
parent a5796bd1bea22b2740e5ca6f885b8b58e8e0394e

Support android_robolectric_test in AndroidStudioInfoAspect.

--
MOS_MIGRATED_REVID=104378214

src/main/java/com/google/devtools/build/lib/ideinfo/AndroidStudioInfoAspect.java

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 1727121..11786f5 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
@@ -202,15 +202,20 @@
     if (ruleKind == Kind.JAVA_LIBRARY
         || ruleKind == Kind.JAVA_IMPORT
         || ruleKind == Kind.JAVA_TEST
-        || ruleKind == Kind.JAVA_BINARY) {
+        || ruleKind == Kind.JAVA_BINARY
+        || ruleKind == Kind.ANDROID_LIBRARY
+        || ruleKind == Kind.ANDROID_BINARY
+        || ruleKind == Kind.ANDROID_TEST
+        || ruleKind == Kind.ANDROID_ROBOELECTRIC_TEST) {
       outputBuilder.setJavaRuleIdeInfo(makeJavaRuleIdeInfo(base));
-    } else if (ruleKind == Kind.ANDROID_LIBRARY
+    }
+    if (ruleKind == Kind.ANDROID_LIBRARY
         || ruleKind == Kind.ANDROID_BINARY
         || ruleKind == Kind.ANDROID_TEST) {
-      outputBuilder.setJavaRuleIdeInfo(makeJavaRuleIdeInfo(base));
       outputBuilder.setAndroidRuleIdeInfo(
           makeAndroidRuleIdeInfo(ruleContext, base, providerBuilder));
-    } else if (ruleKind == Kind.ANDROID_SDK) {
+    }
+    if (ruleKind == Kind.ANDROID_SDK) {
       outputBuilder.setAndroidSdkRuleInfo(
           makeAndroidSdkRuleInfo(ruleContext, base.getProvider(AndroidSdkProvider.class)));
     }
@@ -452,6 +457,8 @@
         return Kind.ANDROID_BINARY;
       case "android_test":
         return Kind.ANDROID_TEST;
+      case "android_robolectric_test":
+        return Kind.ANDROID_ROBOELECTRIC_TEST;
       default:
         {
           if (base.getProvider(AndroidSdkProvider.class) != null) {