Restore proto_library#JavaRuleOutputJarsProvider.

--
MOS_MIGRATED_REVID=123675084

3 files changed, 8 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 be98426590..94292496e9 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
@@ -330,7 +330,7 @@ public class AndroidStudioInfoAspect extends NativeAspectClass implements Config
     // Java rules
     JavaRuleOutputJarsProvider outputJarsProvider =
         base.getProvider(JavaRuleOutputJarsProvider.class);
-    if (outputJarsProvider != null) {
+    if (outputJarsProvider != null && !androidStudioInfoSemantics.suppressJavaRuleInfo(base)) {
       Artifact packageManifest = createPackageManifest(base, ruleContext);
       if (packageManifest != null) {
         providerBuilder.ideInfoFilesBuilder().add(packageManifest);
diff --git a/src/main/java/com/google/devtools/build/lib/ideinfo/AndroidStudioInfoSemantics.java b/src/main/java/com/google/devtools/build/lib/ideinfo/AndroidStudioInfoSemantics.java
index 9c06f3334e..97e5d0c248 100644
--- a/src/main/java/com/google/devtools/build/lib/ideinfo/AndroidStudioInfoSemantics.java
+++ b/src/main/java/com/google/devtools/build/lib/ideinfo/AndroidStudioInfoSemantics.java
@@ -36,6 +36,8 @@ public interface AndroidStudioInfoSemantics {
       RuleContext ruleContext,
       NestedSetBuilder<Artifact> ideResolveArtifacts);
 
+  boolean suppressJavaRuleInfo(ConfiguredTarget base);
+
   void augmentCppRuleInfo(
       CRuleIdeInfo.Builder builder,
       ConfiguredTarget base,
diff --git a/src/main/java/com/google/devtools/build/lib/ideinfo/BazelAndroidStudioInfoSemantics.java b/src/main/java/com/google/devtools/build/lib/ideinfo/BazelAndroidStudioInfoSemantics.java
index 96933a7dd9..35da828394 100644
--- a/src/main/java/com/google/devtools/build/lib/ideinfo/BazelAndroidStudioInfoSemantics.java
+++ b/src/main/java/com/google/devtools/build/lib/ideinfo/BazelAndroidStudioInfoSemantics.java
@@ -48,6 +48,11 @@ public class BazelAndroidStudioInfoSemantics implements AndroidStudioInfoSemanti
   }
 
   @Override
+  public boolean suppressJavaRuleInfo(ConfiguredTarget base) {
+    return false;
+  }
+
+  @Override
   public boolean checkForAdditionalCppRules(String ruleClass) {
     return false;
   }