[8.0.0] Wrap natively created JavaInfo instances for WORKSPACE mo…

…de as well (#24454)

Manually verified this fixes `@rules_android`.

PiperOrigin-RevId: 699072317
Change-Id: I2b2a8c991f72ae132d998191350dc18f0cb097a5 (cherry picked from
commit d73753c)

src/main/java/com/google/devtools/build/lib/rules/java/JavaInfo.java

@@ -573,6 +573,34 @@ public JavaInfoProvider getProvider() {
 
   static final class WorkspaceJavaInfo extends JavaInfo {
 
+    private WorkspaceJavaInfo(
+        JavaCcInfoProvider javaCcInfoProvider,
+        JavaCompilationArgsProvider javaCompilationArgsProvider,
+        JavaCompilationInfoProvider javaCompilationInfoProvider,
+        JavaGenJarsProvider javaGenJarsProvider,
+        JavaModuleFlagsProvider javaModuleFlagsProvider,
+        JavaPluginInfo javaPluginInfo,
+        JavaRuleOutputJarsProvider javaRuleOutputJarsProvider,
+        JavaSourceJarsProvider javaSourceJarsProvider,
+        ImmutableList<Artifact> directRuntimeJars,
+        boolean neverlink,
+        ImmutableList<String> javaConstraints,
+        Location creationLocation) {
+      super(
+          javaCcInfoProvider,
+          javaCompilationArgsProvider,
+          javaCompilationInfoProvider,
+          javaGenJarsProvider,
+          javaModuleFlagsProvider,
+          javaPluginInfo,
+          javaRuleOutputJarsProvider,
+          javaSourceJarsProvider,
+          directRuntimeJars,
+          neverlink,
+          javaConstraints,
+          creationLocation);
+    }
+
     private WorkspaceJavaInfo(StructImpl javaInfo)
         throws EvalException, TypeException, RuleErrorException {
       super(javaInfo);
@@ -764,6 +792,20 @@ public JavaInfo build() {
             neverlink,
             javaConstraints,
             creationLocation);
+      } else if (provider.getKey().equals(WORKSPACE_PROVIDER.getKey())) {
+        return new WorkspaceJavaInfo(
+            /* javaCcInfoProvider= */ null,
+            providerJavaCompilationArgs,
+            providerJavaCompilationInfo,
+            /* javaGenJarsProvider= */ null,
+            /* javaModuleFlagsProvider= */ null,
+            /* javaPluginInfo= */ null,
+            providerJavaRuleOutputJars,
+            providerJavaSourceJars,
+            runtimeJars,
+            neverlink,
+            javaConstraints,
+            creationLocation);
       } else {
         return new JavaInfo(
             /* javaCcInfoProvider= */ null,