Expose java_import and android_library information to skylark

--
MOS_MIGRATED_REVID=101579648

3 files changed, 5 insertions, 1 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidLibrary.java b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidLibrary.java
index 010fa4830d..827586db41 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidLibrary.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidLibrary.java
@@ -36,6 +36,7 @@ import com.google.devtools.build.lib.rules.cpp.LinkerInput;
 import com.google.devtools.build.lib.rules.java.JavaCommon;
 import com.google.devtools.build.lib.rules.java.JavaNeverlinkInfoProvider;
 import com.google.devtools.build.lib.rules.java.JavaSemantics;
+import com.google.devtools.build.lib.rules.java.JavaSkylarkApiProvider;
 import com.google.devtools.build.lib.rules.java.JavaSourceJarsProvider;
 import com.google.devtools.build.lib.rules.java.JavaTargetAttributes;
 import com.google.devtools.build.lib.rules.java.JavaUtil;
@@ -134,6 +135,7 @@ public abstract class AndroidLibrary implements RuleConfiguredTargetFactory {
             .add(JavaSourceJarsProvider.class, new JavaSourceJarsProvider(
                 androidCommon.getTransitiveSourceJars(),
                 androidCommon.getTopLevelSourceJars()))
+            .addSkylarkTransitiveInfo(JavaSkylarkApiProvider.NAME, new JavaSkylarkApiProvider())
             .add(JavaNeverlinkInfoProvider.class,
                 new JavaNeverlinkInfoProvider(androidCommon.isNeverLink()))
             .add(AndroidCcLinkParamsProvider.class,
@@ -177,6 +179,7 @@ public abstract class AndroidLibrary implements RuleConfiguredTargetFactory {
           .add(JavaSourceJarsProvider.class, androidCommon.getJavaSourceJarsProvider())
           .add(AndroidCcLinkParamsProvider.class,
               new AndroidCcLinkParamsProvider(androidCommon.getCcLinkParamsStore()))
+          .addSkylarkTransitiveInfo(JavaSkylarkApiProvider.NAME, new JavaSkylarkApiProvider())
           .add(JavaNeverlinkInfoProvider.class,
               new JavaNeverlinkInfoProvider(androidCommon.isNeverLink()))
           .add(ProguardSpecProvider.class, new ProguardSpecProvider(transitiveProguardConfigs))
diff --git a/src/main/java/com/google/devtools/build/lib/rules/java/JavaImport.java b/src/main/java/com/google/devtools/build/lib/rules/java/JavaImport.java
index 1291f49ae8..9264cdea66 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/java/JavaImport.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/java/JavaImport.java
@@ -135,6 +135,7 @@ public class JavaImport implements RuleConfiguredTargetFactory {
         .setFilesToBuild(filesToBuild)
         .add(JavaRuntimeJarProvider.class,
             new JavaRuntimeJarProvider(common.getJavaCompilationArtifacts().getRuntimeJars()))
+        .addSkylarkTransitiveInfo(JavaSkylarkApiProvider.NAME, new JavaSkylarkApiProvider())
         .add(JavaNeverlinkInfoProvider.class, new JavaNeverlinkInfoProvider(neverLink))
         .add(RunfilesProvider.class, RunfilesProvider.simple(runfiles))
         .add(CcLinkParamsProvider.class, new CcLinkParamsProvider(ccLinkParamsStore))
diff --git a/src/main/java/com/google/devtools/build/lib/rules/java/JavaSkylarkApiProvider.java b/src/main/java/com/google/devtools/build/lib/rules/java/JavaSkylarkApiProvider.java
index b13a128f2e..9775e54e99 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/java/JavaSkylarkApiProvider.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/java/JavaSkylarkApiProvider.java
@@ -30,7 +30,7 @@ import com.google.devtools.build.lib.syntax.SkylarkModule;
     name = "JavaSkylarkApiProvider", doc = "Provides access to information about Java rules")
 public final class JavaSkylarkApiProvider extends SkylarkApiProvider {
   /** The name of the field in Skylark used to access this class. */
-  static final String NAME = "java";
+  public static final String NAME = "java";
 
   @SkylarkCallable(
       name = "source_jars",