aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/main
diff options
context:
space:
mode:
Diffstat (limited to 'src/main')
-rw-r--r--src/main/java/com/google/devtools/build/lib/ideinfo/AndroidStudioInfoAspect.java15
1 files changed, 11 insertions, 4 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 17271211bb..11786f54c0 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 @@ public class AndroidStudioInfoAspect implements ConfiguredAspectFactory {
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 @@ public class AndroidStudioInfoAspect implements ConfiguredAspectFactory {
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) {