Expose AndroidIdlProvider to Skylark (as AndroidIdlInfo).

RELNOTES: none
PiperOrigin-RevId: 204514591

3 files changed, 189 insertions, 30 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidIdlHelper.java b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidIdlHelper.java
index 41cb498ec5..8748454bdb 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidIdlHelper.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidIdlHelper.java
@@ -110,7 +110,7 @@ public class AndroidIdlHelper {
           idlSourceJar);
     }
     builder
-        .addProvider(AndroidIdlProvider.class, androidIdlProvider)
+        .addNativeDeclaredProvider(androidIdlProvider)
         .addOutputGroup(IDL_JARS_OUTPUT_GROUP, androidIdlProvider.getTransitiveIdlJars());
   }
 
@@ -432,7 +432,7 @@ public class AndroidIdlHelper {
 
     for (AndroidIdlProvider dep :
         AndroidCommon.getTransitivePrerequisites(
-            ruleContext, Mode.TARGET, AndroidIdlProvider.class)) {
+            ruleContext, Mode.TARGET, AndroidIdlProvider.PROVIDER)) {
       rootsBuilder.addTransitive(dep.getTransitiveIdlImportRoots());
       importsBuilder.addTransitive(dep.getTransitiveIdlImports());
       preprocessedBuilder.addTransitive(dep.getTransitiveIdlPreprocessed());
@@ -470,7 +470,7 @@ public class AndroidIdlHelper {
     Collection<Artifact> idlPreprocessed = getIdlPreprocessed(ruleContext);
     preprocessedBuilder.addAll(idlPreprocessed);
 
-    return AndroidIdlProvider.create(
+    return new AndroidIdlProvider(
         rootsBuilder.build(),
         importsBuilder.build(),
         jarsBuilder.build(),
diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidIdlProvider.java b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidIdlProvider.java
index d13a0e34a3..ef7f3078a2 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidIdlProvider.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidIdlProvider.java
@@ -1,4 +1,4 @@
-// Copyright 2015 The Bazel Authors. All rights reserved.
+// Copyright 2018 The Bazel Authors. All rights reserved.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -13,52 +13,92 @@
 // limitations under the License.
 package com.google.devtools.build.lib.rules.android;
 
-import com.google.auto.value.AutoValue;
 import com.google.devtools.build.lib.actions.Artifact;
-import com.google.devtools.build.lib.analysis.TransitiveInfoProvider;
 import com.google.devtools.build.lib.collect.nestedset.NestedSet;
 import com.google.devtools.build.lib.collect.nestedset.NestedSetBuilder;
-import com.google.devtools.build.lib.collect.nestedset.Order;
 import com.google.devtools.build.lib.concurrent.ThreadSafety.Immutable;
+import com.google.devtools.build.lib.packages.BuiltinProvider;
+import com.google.devtools.build.lib.packages.NativeInfo;
+import com.google.devtools.build.lib.skylarkbuildapi.android.AndroidIdlProviderApi;
+import com.google.devtools.build.lib.syntax.EvalException;
+import com.google.devtools.build.lib.syntax.SkylarkNestedSet;
 
 /**
  * Configured targets implementing this provider can contribute Android IDL information to the
  * compilation.
  */
-@AutoValue
 @Immutable
-public abstract class AndroidIdlProvider implements TransitiveInfoProvider {
+public final class AndroidIdlProvider extends NativeInfo
+    implements AndroidIdlProviderApi<Artifact> {
 
-  public static final AndroidIdlProvider EMPTY =
-      AndroidIdlProvider.create(
-          NestedSetBuilder.<String>emptySet(Order.STABLE_ORDER),
-          NestedSetBuilder.<Artifact>emptySet(Order.STABLE_ORDER),
-          NestedSetBuilder.<Artifact>emptySet(Order.STABLE_ORDER),
-          NestedSetBuilder.<Artifact>emptySet(Order.STABLE_ORDER));
+  public static final String PROVIDER_NAME = "AndroidIdlInfo";
+  public static final Provider PROVIDER = new Provider();
 
-  public static AndroidIdlProvider create(
+  private final NestedSet<String> transitiveIdlImportRoots;
+  private final NestedSet<Artifact> transitiveIdlImports;
+  private final NestedSet<Artifact> transitiveIdlJars;
+  private final NestedSet<Artifact> transitiveIdlPreprocessed;
+
+  public AndroidIdlProvider(
       NestedSet<String> transitiveIdlImportRoots,
       NestedSet<Artifact> transitiveIdlImports,
       NestedSet<Artifact> transitiveIdlJars,
       NestedSet<Artifact> transitiveIdlPreprocessed) {
-    return new AutoValue_AndroidIdlProvider(
-        transitiveIdlImportRoots,
-        transitiveIdlImports,
-        transitiveIdlJars,
-        transitiveIdlPreprocessed);
+    super(PROVIDER);
+    this.transitiveIdlImportRoots = transitiveIdlImportRoots;
+    this.transitiveIdlImports = transitiveIdlImports;
+    this.transitiveIdlJars = transitiveIdlJars;
+    this.transitiveIdlPreprocessed = transitiveIdlPreprocessed;
+  }
+
+  @Override
+  public NestedSet<String> getTransitiveIdlImportRoots() {
+    return transitiveIdlImportRoots;
+  }
+
+  @Override
+  public NestedSet<Artifact> getTransitiveIdlImports() {
+    return transitiveIdlImports;
   }
 
-  /** The set of IDL import roots need for compiling the IDL sources in the transitive closure. */
-  public abstract NestedSet<String> getTransitiveIdlImportRoots();
+  @Override
+  public NestedSet<Artifact> getTransitiveIdlJars() {
+    return transitiveIdlJars;
+  }
 
-  /** The IDL files in the transitive closure. */
-  public abstract NestedSet<Artifact> getTransitiveIdlImports();
+  @Override
+  public NestedSet<Artifact> getTransitiveIdlPreprocessed() {
+    return transitiveIdlPreprocessed;
+  }
 
-  /** The IDL jars in the transitive closure, both class and source jars. */
-  public abstract NestedSet<Artifact> getTransitiveIdlJars();
+  /** The provider can construct the Android IDL provider. */
+  public static class Provider extends BuiltinProvider<AndroidIdlProvider>
+      implements AndroidIdlProviderApi.Provider<Artifact> {
 
-  /** The preprocessed IDL files in the transitive closure. */
-  public abstract NestedSet<Artifact> getTransitiveIdlPreprocessed();
+    private Provider() {
+      super(PROVIDER_NAME, AndroidIdlProvider.class);
+    }
 
-  AndroidIdlProvider() {}
+    @Override
+    public AndroidIdlProvider createInfo(
+        SkylarkNestedSet transitiveIdlImportRoots,
+        SkylarkNestedSet transitiveIdlImports,
+        SkylarkNestedSet transitiveIdlJars,
+        SkylarkNestedSet transitiveIdlPreprocessed)
+        throws EvalException {
+      return new AndroidIdlProvider(
+          NestedSetBuilder.<String>stableOrder()
+              .addTransitive(transitiveIdlImportRoots.getSet(String.class))
+              .build(),
+          NestedSetBuilder.<Artifact>stableOrder()
+              .addTransitive(transitiveIdlImports.getSet(Artifact.class))
+              .build(),
+          NestedSetBuilder.<Artifact>stableOrder()
+              .addTransitive(transitiveIdlJars.getSet(Artifact.class))
+              .build(),
+          NestedSetBuilder.<Artifact>stableOrder()
+              .addTransitive(transitiveIdlPreprocessed.getSet(Artifact.class))
+              .build());
+    }
+  }
 }
diff --git a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/android/AndroidIdlProviderApi.java b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/android/AndroidIdlProviderApi.java
new file mode 100644
index 0000000000..1278e0780e
--- /dev/null
+++ b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/android/AndroidIdlProviderApi.java
@@ -0,0 +1,119 @@
+// Copyright 2017 The Bazel Authors. All rights reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//    http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+package com.google.devtools.build.lib.skylarkbuildapi.android;
+
+import com.google.devtools.build.lib.collect.nestedset.NestedSet;
+import com.google.devtools.build.lib.skylarkbuildapi.FileApi;
+import com.google.devtools.build.lib.skylarkbuildapi.ProviderApi;
+import com.google.devtools.build.lib.skylarkbuildapi.StructApi;
+import com.google.devtools.build.lib.skylarkinterface.Param;
+import com.google.devtools.build.lib.skylarkinterface.SkylarkCallable;
+import com.google.devtools.build.lib.skylarkinterface.SkylarkConstructor;
+import com.google.devtools.build.lib.skylarkinterface.SkylarkModule;
+import com.google.devtools.build.lib.skylarkinterface.SkylarkModuleCategory;
+import com.google.devtools.build.lib.syntax.EvalException;
+import com.google.devtools.build.lib.syntax.SkylarkNestedSet;
+
+/**
+ * Configured targets implementing this provider can contribute Android IDL information to the
+ * compilation.
+ */
+@SkylarkModule(
+    name = "AndroidIdlInfo",
+    doc = "Information about Android IDLs",
+    category = SkylarkModuleCategory.PROVIDER)
+public interface AndroidIdlProviderApi<FileT extends FileApi> extends StructApi {
+
+  /** Name of this info object. */
+  public static final String NAME = "AndroidIdlInfo";
+
+  /** The set of IDL import roots need for compiling the IDL sources in the transitive closure. */
+  @SkylarkCallable(
+      name = "transitive_idl_import_roots",
+      structField = true,
+      doc = "Returns a depset of strings of all the idl import roots.")
+  NestedSet<String> getTransitiveIdlImportRoots();
+
+  /** The IDL files in the transitive closure. */
+  @SkylarkCallable(
+      name = "transitive_idl_imports",
+      structField = true,
+      doc = "Returns a depset of artifacts of all the idl imports.")
+  NestedSet<FileT> getTransitiveIdlImports();
+
+  /** The IDL jars in the transitive closure, both class and source jars. */
+  @SkylarkCallable(
+      name = "transitive_idl_jars",
+      structField = true,
+      doc = "Returns a depset of artifacts of all the idl class and source jars.")
+  NestedSet<FileT> getTransitiveIdlJars();
+
+  /** The preprocessed IDL files in the transitive closure. */
+  @SkylarkCallable(
+      name = "transitive_idl_preprocessed",
+      structField = true,
+      doc = "Returns a depset of artifacts of all the idl preprocessed files.")
+  NestedSet<FileT> getTransitiveIdlPreprocessed();
+
+  /** The provider implementing this can construct the AndroidIdlInfo provider. */
+  @SkylarkModule(name = "Provider", doc = "", documented = false)
+  public interface Provider<FileT extends FileApi> extends ProviderApi {
+
+    @SkylarkCallable(
+        name = NAME,
+        doc = "The <code>AndroidIdlInfo</code> constructor.",
+        parameters = {
+          @Param(
+              name = "transitive_idl_import_roots",
+              doc = "A depset of strings of all the idl import roots in the transitive closure.",
+              positional = true,
+              named = false,
+              type = SkylarkNestedSet.class,
+              generic1 = String.class),
+          @Param(
+              name = "transitive_idl_imports",
+              doc = "A depset of artifacts of all the idl imports in the transitive closure.",
+              positional = true,
+              named = false,
+              type = SkylarkNestedSet.class,
+              generic1 = FileApi.class),
+          @Param(
+              name = "transitive_idl_jars",
+              doc =
+                  "A depset of artifacts of all the idl class and source jars in the "
+                      + "transitive closure.",
+              positional = true,
+              named = false,
+              type = SkylarkNestedSet.class,
+              generic1 = FileApi.class),
+          @Param(
+              name = "transitive_idl_preprocessed",
+              doc =
+                  "A depset of artifacts of all the idl preprocessed files in the transitive "
+                      + "closure.",
+              positional = true,
+              named = false,
+              type = SkylarkNestedSet.class,
+              generic1 = FileApi.class),
+        },
+        selfCall = true)
+    @SkylarkConstructor(objectType = AndroidIdlProviderApi.class)
+    AndroidIdlProviderApi<FileT> createInfo(
+        SkylarkNestedSet transitiveIdlImportRoots,
+        SkylarkNestedSet transitiveIdlImports,
+        SkylarkNestedSet transitiveIdlJars,
+        SkylarkNestedSet transitiveIdlPreprocessed)
+        throws EvalException;
+  }
+}