Simplify the Skylark exposed makeAar method to accept a list of proguard spec
artifacts provided to the rule.
RELNOTES: none.
PiperOrigin-RevId: 212009816
diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidSkylarkData.java b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidSkylarkData.java
index 88e640f..f3618a9 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidSkylarkData.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidSkylarkData.java
@@ -200,7 +200,7 @@
AndroidResourcesInfo resourcesInfo,
AndroidAssetsInfo assetsInfo,
Artifact libraryClassJar,
- SkylarkList<ConfiguredTarget> proguardSpecs,
+ SkylarkList<Artifact> localProguardSpecs,
SkylarkList<AndroidLibraryAarInfo> deps,
boolean neverlink)
throws EvalException, InterruptedException {
@@ -257,7 +257,7 @@
resourcesInfo.getManifest(),
resourcesInfo.getRTxt(),
libraryClassJar,
- filesFromConfiguredTargets(proguardSpecs))
+ localProguardSpecs.getImmutableList())
.toProvider(deps, definesLocalResources);
}
@@ -273,7 +273,7 @@
Object customPackage,
boolean neverlink,
boolean enableDataBinding,
- SkylarkList<ConfiguredTarget> proguardSpecs,
+ SkylarkList<Artifact> localProguardSpecs,
SkylarkList<ConfiguredTarget> deps,
Location location,
Environment env)
@@ -333,7 +333,7 @@
resourcesInfo,
assetsInfo,
libraryClassJar,
- proguardSpecs,
+ localProguardSpecs,
getProviders(deps, AndroidLibraryAarInfo.PROVIDER),
neverlink);
diff --git a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/android/AndroidDataProcessingApi.java b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/android/AndroidDataProcessingApi.java
index ceca22f..5991eca 100644
--- a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/android/AndroidDataProcessingApi.java
+++ b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/android/AndroidDataProcessingApi.java
@@ -365,9 +365,9 @@
type = FileApi.class,
doc = "The library class jar."),
@Param(
- name = "proguard_specs",
+ name = "local_proguard_specs",
type = SkylarkList.class,
- generic1 = TransitiveInfoCollectionApi.class,
+ generic1 = FileApi.class,
defaultValue = "[]",
positional = false,
named = true,
@@ -402,7 +402,7 @@
AndroidResourcesInfoT resourcesInfo,
AndroidAssetsInfoT assetsInfo,
FileT libraryClassJar,
- SkylarkList<TransitiveInfoCollectionT> proguardSpecs,
+ SkylarkList<FileT> localProguardSpecs,
SkylarkList<AndroidLibraryAarInfoT> deps,
boolean neverlink)
throws EvalException, InterruptedException;
@@ -504,9 +504,9 @@
"Defaults to False. If True, processes data binding expressions in layout"
+ " resources."),
@Param(
- name = "proguard_specs",
+ name = "local_proguard_specs",
type = SkylarkList.class,
- generic1 = TransitiveInfoCollectionApi.class,
+ generic1 = FileApi.class,
defaultValue = "[]",
positional = false,
named = true,
@@ -541,7 +541,7 @@
Object customPackage,
boolean neverlink,
boolean enableDataBinding,
- SkylarkList<TransitiveInfoCollectionT> proguardSpecs,
+ SkylarkList<FileT> localProguardSpecs,
SkylarkList<TransitiveInfoCollectionT> deps,
Location location,
Environment env)
