Add a number of Android-related Info objects to recognized Stardoc symbols
These symbols should be added by bootstrap in a future CL, but are currently added without bootstrap. This change provides a hacky workaround until these objects are appropriately added to bootstraps.
RELNOTES: None.
PiperOrigin-RevId: 221354519
diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidAssetsInfo.java b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidAssetsInfo.java
index 9ceb67d..7bca114 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidAssetsInfo.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidAssetsInfo.java
@@ -32,7 +32,6 @@
public final class AndroidAssetsInfo extends NativeInfo
implements AndroidAssetsInfoApi<Artifact, ParsedAndroidAssets> {
- public static final String PROVIDER_NAME = "AndroidAssetsInfo";
public static final Provider PROVIDER = new Provider();
private final Label label;
@@ -154,7 +153,7 @@
implements AndroidAssetsInfoApi.Provider<Artifact, ParsedAndroidAssets> {
private Provider() {
- super(PROVIDER_NAME, AndroidAssetsInfo.class);
+ super(NAME, AndroidAssetsInfo.class);
}
@Override
diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidBinaryDataInfo.java b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidBinaryDataInfo.java
index 75f56b5..45dcdff 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidBinaryDataInfo.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidBinaryDataInfo.java
@@ -26,10 +26,9 @@
*/
public class AndroidBinaryDataInfo extends NativeInfo
implements AndroidBinaryDataInfoApi<Artifact> {
- public static final String SKYLARK_NAME = "AndroidBinaryData";
public static final BuiltinProvider<AndroidBinaryDataInfo> PROVIDER =
- new BuiltinProvider<AndroidBinaryDataInfo>(SKYLARK_NAME, AndroidBinaryDataInfo.class) {};
+ new BuiltinProvider<AndroidBinaryDataInfo>(NAME, AndroidBinaryDataInfo.class) {};
private final Artifact dataApk;
private final Artifact resourceProguardConfig;
diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidCcLinkParamsProvider.java b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidCcLinkParamsProvider.java
index 52022ba..89aa629 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidCcLinkParamsProvider.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidCcLinkParamsProvider.java
@@ -25,7 +25,7 @@
@Immutable
public final class AndroidCcLinkParamsProvider extends NativeInfo
implements AndroidCcLinkParamsProviderApi<CcInfo> {
- public static final String PROVIDER_NAME = "AndroidCcLinkParamsInfo";
+
public static final Provider PROVIDER = new Provider();
private final CcInfo ccInfo;
@@ -44,7 +44,7 @@
public static class Provider extends BuiltinProvider<AndroidCcLinkParamsProvider>
implements AndroidCcLinkParamsProviderApi.Provider<CcInfo> {
private Provider() {
- super(PROVIDER_NAME, AndroidCcLinkParamsProvider.class);
+ super(NAME, AndroidCcLinkParamsProvider.class);
}
@Override
diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidDex2OatInfo.java b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidDex2OatInfo.java
index 4ebb089..db350a0 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidDex2OatInfo.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidDex2OatInfo.java
@@ -30,7 +30,6 @@
@Immutable
public final class AndroidDex2OatInfo extends NativeInfo implements AndroidDex2OatInfoApi {
- private static final String SKYLARK_NAME = "AndroidDex2OatInfo";
private static final FunctionSignature.WithValues<Object, SkylarkType> SIGNATURE =
FunctionSignature.WithValues.create(
FunctionSignature.of(
@@ -43,7 +42,7 @@
/*defaultValues=*/ null,
/*types=*/ ImmutableList.of(SkylarkType.of(Boolean.class))); // instrumentation_apk
public static final NativeProvider<AndroidDex2OatInfo> PROVIDER =
- new NativeProvider<AndroidDex2OatInfo>(AndroidDex2OatInfo.class, SKYLARK_NAME, SIGNATURE) {
+ new NativeProvider<AndroidDex2OatInfo>(AndroidDex2OatInfo.class, NAME, SIGNATURE) {
@Override
protected AndroidDex2OatInfo createInstanceFromSkylark(
Object[] args, Environment env, Location loc) {
diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidFeatureFlagSetProvider.java b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidFeatureFlagSetProvider.java
index dae015d..5fa9c1e 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidFeatureFlagSetProvider.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidFeatureFlagSetProvider.java
@@ -47,7 +47,6 @@
public final class AndroidFeatureFlagSetProvider extends NativeInfo
implements AndroidFeatureFlagSetProviderApi {
- public static final String PROVIDER_NAME = "AndroidFeatureFlagSetProvider";
public static final Provider PROVIDER = new Provider();
/** The name of the attribute used by Android rules to set config_feature_flags. */
@@ -146,11 +145,11 @@
public static class Provider extends BuiltinProvider<AndroidFeatureFlagSetProvider>
implements AndroidFeatureFlagSetProviderApi.Provider {
private Provider() {
- super(PROVIDER_NAME, AndroidFeatureFlagSetProvider.class);
+ super(NAME, AndroidFeatureFlagSetProvider.class);
}
public String getName() {
- return PROVIDER_NAME;
+ return NAME;
}
@Override
diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidIdeInfoProvider.java b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidIdeInfoProvider.java
index 59dc641..0853fd5 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidIdeInfoProvider.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidIdeInfoProvider.java
@@ -42,7 +42,6 @@
public final class AndroidIdeInfoProvider extends NativeInfo
implements AndroidIdeInfoProviderApi<Artifact, OutputJar> {
- public static final String PROVIDER_NAME = "AndroidIdeInfo";
public static final Provider PROVIDER = new Provider();
/** Builder for {@link AndroidIdeInfoProvider} */
@@ -313,7 +312,7 @@
public static class Provider extends BuiltinProvider<AndroidIdeInfoProvider>
implements AndroidIdeInfoProviderApi.Provider<Artifact, OutputJar> {
private Provider() {
- super(PROVIDER_NAME, AndroidIdeInfoProvider.class);
+ super(NAME, AndroidIdeInfoProvider.class);
}
@Override
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 ef7f307..b45c08d 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
@@ -31,7 +31,6 @@
public final class AndroidIdlProvider extends NativeInfo
implements AndroidIdlProviderApi<Artifact> {
- public static final String PROVIDER_NAME = "AndroidIdlInfo";
public static final Provider PROVIDER = new Provider();
private final NestedSet<String> transitiveIdlImportRoots;
@@ -76,7 +75,7 @@
implements AndroidIdlProviderApi.Provider<Artifact> {
private Provider() {
- super(PROVIDER_NAME, AndroidIdlProvider.class);
+ super(NAME, AndroidIdlProvider.class);
}
@Override
diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidLibraryAarInfo.java b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidLibraryAarInfo.java
index 7f34363..c973f0e 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidLibraryAarInfo.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidLibraryAarInfo.java
@@ -35,9 +35,9 @@
@Immutable
public class AndroidLibraryAarInfo extends NativeInfo
implements AndroidLibraryAarInfoApi<Artifact> {
- private static final String SKYLARK_NAME = "AndroidLibraryAarInfo";
+
public static final NativeProvider<AndroidLibraryAarInfo> PROVIDER =
- new NativeProvider<AndroidLibraryAarInfo>(AndroidLibraryAarInfo.class, SKYLARK_NAME) {};
+ new NativeProvider<AndroidLibraryAarInfo>(AndroidLibraryAarInfo.class, NAME) {};
@Nullable private final Aar aar;
private final NestedSet<Aar> transitiveAars;
diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidLibraryResourceClassJarProvider.java b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidLibraryResourceClassJarProvider.java
index 6e3ac67..7d98ae9 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidLibraryResourceClassJarProvider.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidLibraryResourceClassJarProvider.java
@@ -30,7 +30,6 @@
public final class AndroidLibraryResourceClassJarProvider extends NativeInfo
implements AndroidLibraryResourceClassJarProviderApi<Artifact> {
- public static final String PROVIDER_NAME = "AndroidLibraryResourceClassJarProvider";
public static final Provider PROVIDER = new Provider();
private final NestedSet<Artifact> resourceClassJars;
@@ -56,11 +55,11 @@
implements AndroidLibraryResourceClassJarProviderApi.Provider<Artifact> {
private Provider() {
- super(PROVIDER_NAME, AndroidLibraryResourceClassJarProvider.class);
+ super(NAME, AndroidLibraryResourceClassJarProvider.class);
}
public String getName() {
- return PROVIDER_NAME;
+ return NAME;
}
@Override
diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidManifestInfo.java b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidManifestInfo.java
index 6470b80..bc9f7be 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidManifestInfo.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidManifestInfo.java
@@ -25,7 +25,6 @@
/** A provider of information about this target's manifest. */
public class AndroidManifestInfo extends NativeInfo implements AndroidManifestInfoApi<Artifact> {
- private static final String SKYLARK_NAME = "AndroidManifestInfo";
private static final FunctionSignature.WithValues<Object, SkylarkType> SIGNATURE =
FunctionSignature.WithValues.create(
@@ -45,7 +44,7 @@
SkylarkType.BOOL)); // exports_manifest
public static final NativeProvider<AndroidManifestInfo> PROVIDER =
- new NativeProvider<AndroidManifestInfo>(AndroidManifestInfo.class, SKYLARK_NAME, SIGNATURE) {
+ new NativeProvider<AndroidManifestInfo>(AndroidManifestInfo.class, NAME, SIGNATURE) {
@Override
public AndroidManifestInfo createInstanceFromSkylark(
Object[] args, Environment env, Location loc) {
diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidPreDexJarProvider.java b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidPreDexJarProvider.java
index c987b3e..403a289 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidPreDexJarProvider.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidPreDexJarProvider.java
@@ -25,7 +25,7 @@
@Immutable
public final class AndroidPreDexJarProvider extends NativeInfo
implements AndroidPreDexJarProviderApi<Artifact> {
- public static final String PROVIDER_NAME = "AndroidPreDexJarInfo";
+
public static final Provider PROVIDER = new Provider();
private final Artifact preDexJar;
@@ -45,7 +45,7 @@
public static class Provider extends BuiltinProvider<AndroidPreDexJarProvider>
implements AndroidPreDexJarProviderApi.Provider<Artifact> {
private Provider() {
- super(PROVIDER_NAME, AndroidPreDexJarProvider.class);
+ super(NAME, AndroidPreDexJarProvider.class);
}
@Override
diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidProguardInfo.java b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidProguardInfo.java
index 6f2a1ff..43ec132 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidProguardInfo.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidProguardInfo.java
@@ -51,7 +51,7 @@
public static class Provider extends BuiltinProvider<AndroidProguardInfo>
implements AndroidProguardInfoApi.Provider<Artifact> {
private Provider() {
- super(PROVIDER_NAME, AndroidProguardInfo.class);
+ super(NAME, AndroidProguardInfo.class);
}
@Override
diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidSdkProvider.java b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidSdkProvider.java
index da40eb9..6925119 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidSdkProvider.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidSdkProvider.java
@@ -33,7 +33,6 @@
public final class AndroidSdkProvider extends NativeInfo
implements AndroidSdkProviderApi<Artifact, FilesToRunProvider, TransitiveInfoCollection> {
- public static final String PROVIDER_NAME = "AndroidSdkInfo";
public static final Provider PROVIDER = new Provider();
private final String buildToolsVersion;
@@ -203,7 +202,7 @@
Artifact, FilesToRunProvider, TransitiveInfoCollection> {
private Provider() {
- super(PROVIDER_NAME, AndroidSdkProvider.class);
+ super(NAME, AndroidSdkProvider.class);
}
@Override
diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/ProguardMappingProvider.java b/src/main/java/com/google/devtools/build/lib/rules/android/ProguardMappingProvider.java
index f5dc285..51a823e 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/android/ProguardMappingProvider.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/android/ProguardMappingProvider.java
@@ -25,7 +25,6 @@
public final class ProguardMappingProvider extends NativeInfo
implements ProguardMappingProviderApi<Artifact> {
- public static final String PROVIDER_NAME = "ProguardMappingInfo";
public static final Provider PROVIDER = new Provider();
private final Artifact proguardMapping;
@@ -45,7 +44,7 @@
implements ProguardMappingProviderApi.Provider<Artifact> {
private Provider() {
- super(PROVIDER_NAME, ProguardMappingProvider.class);
+ super(NAME, ProguardMappingProvider.class);
}
@Override
diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/databinding/UsesDataBindingProvider.java b/src/main/java/com/google/devtools/build/lib/rules/android/databinding/UsesDataBindingProvider.java
index 525bbac..e6a4aaa 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/android/databinding/UsesDataBindingProvider.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/android/databinding/UsesDataBindingProvider.java
@@ -30,7 +30,6 @@
public final class UsesDataBindingProvider extends NativeInfo
implements UsesDataBindingProviderApi<Artifact> {
- public static final String PROVIDER_NAME = "UsesDataBindingInfo";
public static final Provider PROVIDER = new Provider();
private final ImmutableList<Artifact> metadataOutputs;
@@ -50,7 +49,7 @@
implements UsesDataBindingProviderApi.Provider<Artifact> {
private Provider() {
- super(PROVIDER_NAME, UsesDataBindingProvider.class);
+ super(NAME, UsesDataBindingProvider.class);
}
@Override
diff --git a/src/main/java/com/google/devtools/build/lib/rules/java/proto/GeneratedExtensionRegistryProvider.java b/src/main/java/com/google/devtools/build/lib/rules/java/proto/GeneratedExtensionRegistryProvider.java
index 0c03339..60a29ee 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/java/proto/GeneratedExtensionRegistryProvider.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/java/proto/GeneratedExtensionRegistryProvider.java
@@ -36,7 +36,6 @@
public final class GeneratedExtensionRegistryProvider extends NativeInfo
implements GeneratedExtensionRegistryProviderApi<Artifact> {
- public static final String PROVIDER_NAME = "GeneratedExtensionRegistryProvider";
public static final Provider PROVIDER = new Provider();
private final Label generatingRuleLabel;
@@ -142,11 +141,11 @@
public static class Provider extends BuiltinProvider<GeneratedExtensionRegistryProvider>
implements GeneratedExtensionRegistryProviderApi.Provider<Artifact> {
private Provider() {
- super(PROVIDER_NAME, GeneratedExtensionRegistryProvider.class);
+ super(NAME, GeneratedExtensionRegistryProvider.class);
}
public String getName() {
- return PROVIDER_NAME;
+ return NAME;
}
@Override
diff --git a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/android/AndroidAssetsInfoApi.java b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/android/AndroidAssetsInfoApi.java
index d003637..439dd99 100644
--- a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/android/AndroidAssetsInfoApi.java
+++ b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/android/AndroidAssetsInfoApi.java
@@ -40,7 +40,8 @@
public interface AndroidAssetsInfoApi<FileT extends FileApi, AssetsT extends ParsedAndroidAssetsApi>
extends StructApi {
- public static final String NAME = "AndroidAssetsInfo";
+ /** The name of the provider for this info object. */
+ String NAME = "AndroidAssetsInfo";
@SkylarkCallable(name = "label", structField = true, doc = "", documented = false)
Label getLabel();
diff --git a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/android/AndroidBinaryDataInfoApi.java b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/android/AndroidBinaryDataInfoApi.java
index baa130c..c866b6f 100644
--- a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/android/AndroidBinaryDataInfoApi.java
+++ b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/android/AndroidBinaryDataInfoApi.java
@@ -33,6 +33,9 @@
category = SkylarkModuleCategory.PROVIDER)
public interface AndroidBinaryDataInfoApi<FileT extends FileApi> extends StructApi {
+ /** The name of the provider for this info object. */
+ String NAME = "AndroidBinaryData";
+
@SkylarkCallable(
name = "resource_apk",
structField = true,
diff --git a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/android/AndroidCcLinkParamsProviderApi.java b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/android/AndroidCcLinkParamsProviderApi.java
index 84d7afc..cfc9524 100644
--- a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/android/AndroidCcLinkParamsProviderApi.java
+++ b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/android/AndroidCcLinkParamsProviderApi.java
@@ -35,7 +35,7 @@
category = SkylarkModuleCategory.PROVIDER)
public interface AndroidCcLinkParamsProviderApi<T extends CcInfoApi> extends StructApi {
/** Name of this info object. */
- public static String NAME = "AndroidCcLinkParamsInfo";
+ String NAME = "AndroidCcLinkParamsInfo";
/** Returns the cc link params. */
@SkylarkCallable(name = "link_params", structField = true, doc = "", documented = false)
diff --git a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/android/AndroidDex2OatInfoApi.java b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/android/AndroidDex2OatInfoApi.java
index 0f934a8..9c5596a 100644
--- a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/android/AndroidDex2OatInfoApi.java
+++ b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/android/AndroidDex2OatInfoApi.java
@@ -26,4 +26,7 @@
"Do not use this module. It is intended for migration purposes only. If you depend on it, "
+ "you will be broken when it is removed.",
documented = false)
-public interface AndroidDex2OatInfoApi extends StructApi {}
+public interface AndroidDex2OatInfoApi extends StructApi {
+ /** The name of the provider for this info object. */
+ String NAME = "AndroidDex2OatInfo";
+}
diff --git a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/android/AndroidFeatureFlagSetProviderApi.java b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/android/AndroidFeatureFlagSetProviderApi.java
index fa8a583..1ab55d9 100644
--- a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/android/AndroidFeatureFlagSetProviderApi.java
+++ b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/android/AndroidFeatureFlagSetProviderApi.java
@@ -36,7 +36,8 @@
category = SkylarkModuleCategory.PROVIDER)
public interface AndroidFeatureFlagSetProviderApi extends StructApi {
- public static final String NAME = "AndroidFeatureFlagSet";
+ /** The name of the provider for this info object. */
+ String NAME = "AndroidFeatureFlagSet";
@SkylarkCallable(
name = "flags",
diff --git a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/android/AndroidIdeInfoProviderApi.java b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/android/AndroidIdeInfoProviderApi.java
index 93f1bab..e8421c2 100644
--- a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/android/AndroidIdeInfoProviderApi.java
+++ b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/android/AndroidIdeInfoProviderApi.java
@@ -44,7 +44,7 @@
extends StructApi {
/** Name of this info object. */
- public static String NAME = "AndroidIdeInfo";
+ String NAME = "AndroidIdeInfo";
/** Returns the Java package. */
@SkylarkCallable(name = "java_package", structField = true, doc = "", documented = false)
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
index c1d2dc6..2d57de2 100644
--- 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
@@ -40,7 +40,7 @@
public interface AndroidIdlProviderApi<FileT extends FileApi> extends StructApi {
/** Name of this info object. */
- public static final String NAME = "AndroidIdlInfo";
+ String NAME = "AndroidIdlInfo";
/** The set of IDL import roots need for compiling the IDL sources in the transitive closure. */
@SkylarkCallable(
diff --git a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/android/AndroidLibraryAarInfoApi.java b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/android/AndroidLibraryAarInfoApi.java
index f5a02c2..d2467f9 100644
--- a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/android/AndroidLibraryAarInfoApi.java
+++ b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/android/AndroidLibraryAarInfoApi.java
@@ -30,6 +30,10 @@
documented = false,
category = SkylarkModuleCategory.PROVIDER)
public interface AndroidLibraryAarInfoApi<FileT extends FileApi> extends StructApi {
+
+ /** The name of the provider for this info object. */
+ String NAME = "AndroidLibraryAarInfo";
+
@SkylarkCallable(
name = "aar",
doc = "",
diff --git a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/android/AndroidLibraryResourceClassJarProviderApi.java b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/android/AndroidLibraryResourceClassJarProviderApi.java
index 5c4d11c..6b6a87f 100644
--- a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/android/AndroidLibraryResourceClassJarProviderApi.java
+++ b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/android/AndroidLibraryResourceClassJarProviderApi.java
@@ -36,8 +36,8 @@
category = SkylarkModuleCategory.PROVIDER)
public interface AndroidLibraryResourceClassJarProviderApi<FileT extends FileApi>
extends StructApi {
-
- public static final String NAME = "AndroidLibraryResourceClassJarProvider";
+ /** The name of the provider for this info object. */
+ String NAME = "AndroidLibraryResourceClassJarProvider";
@SkylarkCallable(name = "jars", structField = true, doc = "", documented = false)
NestedSet<FileT> getResourceClassJars();
diff --git a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/android/AndroidManifestInfoApi.java b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/android/AndroidManifestInfoApi.java
index 0740540..7af2cf5 100644
--- a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/android/AndroidManifestInfoApi.java
+++ b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/android/AndroidManifestInfoApi.java
@@ -30,6 +30,9 @@
category = SkylarkModuleCategory.PROVIDER)
public interface AndroidManifestInfoApi<FileT extends FileApi> extends StructApi {
+ /** The name of the provider for this info object. */
+ String NAME = "AndroidManifestInfo";
+
@SkylarkCallable(
name = "manifest",
doc = "This target's manifest, merged with manifests from dependencies",
diff --git a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/android/AndroidPreDexJarProviderApi.java b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/android/AndroidPreDexJarProviderApi.java
index 5e05243..ca570cb 100644
--- a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/android/AndroidPreDexJarProviderApi.java
+++ b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/android/AndroidPreDexJarProviderApi.java
@@ -35,7 +35,7 @@
category = SkylarkModuleCategory.PROVIDER)
public interface AndroidPreDexJarProviderApi<FileT extends FileApi> extends StructApi {
/** Name of this info object. */
- public static String NAME = "AndroidPreDexJarInfo";
+ String NAME = "AndroidPreDexJarInfo";
/** Returns the jar to be dexed. */
@SkylarkCallable(name = "pre_dex_jar", structField = true, doc = "", documented = false)
diff --git a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/android/AndroidProguardInfoApi.java b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/android/AndroidProguardInfoApi.java
index fd0fb4f..8bfa902 100644
--- a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/android/AndroidProguardInfoApi.java
+++ b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/android/AndroidProguardInfoApi.java
@@ -32,7 +32,8 @@
+ "you will be broken when it is removed.",
documented = false)
public interface AndroidProguardInfoApi<FileT extends FileApi> extends StructApi {
- String PROVIDER_NAME = "AndroidProguardInfo";
+ /** The name of the provider for this info object. */
+ String NAME = "AndroidProguardInfo";
@SkylarkCallable(
name = "local_proguard_specs",
@@ -51,7 +52,7 @@
public interface Provider<F extends FileApi> extends ProviderApi {
@SkylarkCallable(
- name = PROVIDER_NAME,
+ name = NAME,
doc = "The <code>AndroidProguardInfo</code> constructor.",
documented = false,
parameters = {
diff --git a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/android/AndroidSdkProviderApi.java b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/android/AndroidSdkProviderApi.java
index d579e29..9f7d1f0 100644
--- a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/android/AndroidSdkProviderApi.java
+++ b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/android/AndroidSdkProviderApi.java
@@ -42,7 +42,7 @@
extends StructApi {
/** Name of this info object. */
- public static final String NAME = "AndroidSdkInfo";
+ String NAME = "AndroidSdkInfo";
/** The value of build_tools_version. May be null or empty. */
@SkylarkCallable(name = "build_tools_version", structField = true, doc = "", documented = false)
diff --git a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/android/ProguardMappingProviderApi.java b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/android/ProguardMappingProviderApi.java
index 09c4d0a..8ff5fde 100644
--- a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/android/ProguardMappingProviderApi.java
+++ b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/android/ProguardMappingProviderApi.java
@@ -34,7 +34,8 @@
category = SkylarkModuleCategory.PROVIDER)
public interface ProguardMappingProviderApi<FileT extends FileApi> extends StructApi {
- public static final String NAME = "ProguardMappingInfo";
+ /** The name of the provider for this info object. */
+ String NAME = "ProguardMappingInfo";
@SkylarkCallable(name = "proguard_mapping", structField = true, doc = "", documented = false)
FileT getProguardMapping();
diff --git a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/android/UsesDataBindingProviderApi.java b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/android/UsesDataBindingProviderApi.java
index bada695..8327e6e 100644
--- a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/android/UsesDataBindingProviderApi.java
+++ b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/android/UsesDataBindingProviderApi.java
@@ -37,7 +37,7 @@
public interface UsesDataBindingProviderApi<T extends FileApi> extends StructApi {
/** Name of this info object. */
- public static String NAME = "UsesDataBindingInfo";
+ String NAME = "UsesDataBindingInfo";
/**
* Returns the metadata outputs from this rule's annotation processing that describe how it
diff --git a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/java/GeneratedExtensionRegistryProviderApi.java b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/java/GeneratedExtensionRegistryProviderApi.java
index 8673a33..e5ecec9 100644
--- a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/java/GeneratedExtensionRegistryProviderApi.java
+++ b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/java/GeneratedExtensionRegistryProviderApi.java
@@ -33,7 +33,8 @@
category = SkylarkModuleCategory.PROVIDER)
public interface GeneratedExtensionRegistryProviderApi<FileT extends FileApi> extends StructApi {
- public static final String NAME = "GeneratedExtensionRegistryProvider";
+ /** The name of the provider for this info object. */
+ String NAME = "GeneratedExtensionRegistryProvider";
@SkylarkCallable(name = "rule_label", structField = true, doc = "", documented = false)
Label getGeneratingRuleLabel();
diff --git a/src/main/java/com/google/devtools/build/skydoc/SkydocMain.java b/src/main/java/com/google/devtools/build/skydoc/SkydocMain.java
index 7a15a51..53f22de 100644
--- a/src/main/java/com/google/devtools/build/skydoc/SkydocMain.java
+++ b/src/main/java/com/google/devtools/build/skydoc/SkydocMain.java
@@ -22,10 +22,26 @@
import com.google.devtools.build.lib.cmdline.LabelSyntaxException;
import com.google.devtools.build.lib.events.EventHandler;
import com.google.devtools.build.lib.skylarkbuildapi.TopLevelBootstrap;
+import com.google.devtools.build.lib.skylarkbuildapi.android.AndroidAssetsInfoApi;
+import com.google.devtools.build.lib.skylarkbuildapi.android.AndroidBinaryDataInfoApi;
import com.google.devtools.build.lib.skylarkbuildapi.android.AndroidBootstrap;
+import com.google.devtools.build.lib.skylarkbuildapi.android.AndroidCcLinkParamsProviderApi;
+import com.google.devtools.build.lib.skylarkbuildapi.android.AndroidDex2OatInfoApi;
+import com.google.devtools.build.lib.skylarkbuildapi.android.AndroidFeatureFlagSetProviderApi;
+import com.google.devtools.build.lib.skylarkbuildapi.android.AndroidIdeInfoProviderApi;
+import com.google.devtools.build.lib.skylarkbuildapi.android.AndroidIdlProviderApi;
+import com.google.devtools.build.lib.skylarkbuildapi.android.AndroidLibraryAarInfoApi;
+import com.google.devtools.build.lib.skylarkbuildapi.android.AndroidLibraryResourceClassJarProviderApi;
+import com.google.devtools.build.lib.skylarkbuildapi.android.AndroidManifestInfoApi;
+import com.google.devtools.build.lib.skylarkbuildapi.android.AndroidPreDexJarProviderApi;
+import com.google.devtools.build.lib.skylarkbuildapi.android.AndroidProguardInfoApi;
+import com.google.devtools.build.lib.skylarkbuildapi.android.AndroidSdkProviderApi;
+import com.google.devtools.build.lib.skylarkbuildapi.android.ProguardMappingProviderApi;
+import com.google.devtools.build.lib.skylarkbuildapi.android.UsesDataBindingProviderApi;
import com.google.devtools.build.lib.skylarkbuildapi.apple.AppleBootstrap;
import com.google.devtools.build.lib.skylarkbuildapi.config.ConfigBootstrap;
import com.google.devtools.build.lib.skylarkbuildapi.cpp.CcBootstrap;
+import com.google.devtools.build.lib.skylarkbuildapi.java.GeneratedExtensionRegistryProviderApi;
import com.google.devtools.build.lib.skylarkbuildapi.java.JavaBootstrap;
import com.google.devtools.build.lib.skylarkbuildapi.platform.PlatformBootstrap;
import com.google.devtools.build.lib.skylarkbuildapi.repository.RepositoryBootstrap;
@@ -442,10 +458,33 @@
platformBootstrap.addBindingsToBuilder(envBuilder);
repositoryBootstrap.addBindingsToBuilder(envBuilder);
testingBootstrap.addBindingsToBuilder(envBuilder);
+ addNonBootstrapGlobals(envBuilder);
return GlobalFrame.createForBuiltins(envBuilder.build());
}
+ // TODO(cparsons): Remove this constant by migrating the contained symbols to bootstraps.
+ private static final String[] nonBootstrapGlobals = {"android_data", AndroidDex2OatInfoApi.NAME,
+ AndroidManifestInfoApi.NAME, AndroidAssetsInfoApi.NAME,
+ AndroidLibraryAarInfoApi.NAME, AndroidProguardInfoApi.NAME,
+ AndroidIdlProviderApi.NAME, AndroidIdeInfoProviderApi.NAME,
+ AndroidPreDexJarProviderApi.NAME, UsesDataBindingProviderApi.NAME,
+ AndroidCcLinkParamsProviderApi.NAME, AndroidLibraryResourceClassJarProviderApi.NAME,
+ AndroidSdkProviderApi.NAME, AndroidFeatureFlagSetProviderApi.NAME,
+ ProguardMappingProviderApi.NAME, GeneratedExtensionRegistryProviderApi.NAME,
+ AndroidBinaryDataInfoApi.NAME };
+
+ /**
+ * A hack to add a number of global symbols which are part of the build API but are otherwise
+ * added by Bazel.
+ */
+ // TODO(cparsons): Remove this method by migrating the contained symbols to bootstraps.
+ private static void addNonBootstrapGlobals(ImmutableMap.Builder<String, Object> envBuilder) {
+ for (String global : nonBootstrapGlobals) {
+ envBuilder.put(global, global);
+ }
+ }
+
private static Environment createEnvironment(EventHandler eventHandler, GlobalFrame globals,
Map<String, Extension> imports) {
return Environment.builder(Mutability.create("Skydoc"))
diff --git a/src/test/java/com/google/devtools/build/lib/rules/android/AndroidDataBindingTest.java b/src/test/java/com/google/devtools/build/lib/rules/android/AndroidDataBindingTest.java
index 1d1d59c..751c112 100644
--- a/src/test/java/com/google/devtools/build/lib/rules/android/AndroidDataBindingTest.java
+++ b/src/test/java/com/google/devtools/build/lib/rules/android/AndroidDataBindingTest.java
@@ -344,7 +344,7 @@
final UsesDataBindingProvider usesDataBindingProvider = a.get(UsesDataBindingProvider.PROVIDER);
Truth.assertThat(usesDataBindingProvider)
- .named(UsesDataBindingProvider.PROVIDER_NAME)
+ .named(UsesDataBindingProvider.NAME)
.isNotNull();
Truth.assertThat(
diff --git a/src/test/java/com/google/devtools/build/skydoc/testdata/android_basic_test/input.bzl b/src/test/java/com/google/devtools/build/skydoc/testdata/android_basic_test/input.bzl
index 991748b..402bc00 100644
--- a/src/test/java/com/google/devtools/build/skydoc/testdata/android_basic_test/input.bzl
+++ b/src/test/java/com/google/devtools/build/skydoc/testdata/android_basic_test/input.bzl
@@ -1,10 +1,12 @@
def exercise_the_api():
- var1 = android_common.create_device_broker_info("")
- var2 = ApkInfo
- var3 = AndroidInstrumentationInfo
- var4 = AndroidDeviceBrokerInfo
- var5 = AndroidResourcesInfo
- var6 = AndroidNativeLibsInfo
+ _var1 = android_common.create_device_broker_info("")
+ _var2 = ApkInfo
+ _var3 = AndroidInstrumentationInfo
+ _var4 = AndroidDeviceBrokerInfo
+ _var5 = AndroidResourcesInfo
+ _var6 = AndroidNativeLibsInfo
+ _var7 = AndroidSdkInfo
+ _var8 = android_data
exercise_the_api()
