diff options
Diffstat (limited to 'java/aar.go')
-rw-r--r-- | java/aar.go | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/java/aar.go b/java/aar.go index bb24f2dae..f7c8367d0 100644 --- a/java/aar.go +++ b/java/aar.go @@ -825,7 +825,7 @@ func (a *AndroidLibrary) GenerateAndroidBuildActions(ctx android.ModuleContext) a.linter.resources = a.aapt.resourceFiles proguardSpecInfo := a.collectProguardSpecInfo(ctx) - ctx.SetProvider(ProguardSpecInfoProvider, proguardSpecInfo) + android.SetProvider(ctx, ProguardSpecInfoProvider, proguardSpecInfo) exportedProguardFlagsFiles := proguardSpecInfo.ProguardFlagsFiles.ToList() a.extraProguardFlagsFiles = append(a.extraProguardFlagsFiles, exportedProguardFlagsFiles...) a.extraProguardFlagsFiles = append(a.extraProguardFlagsFiles, a.proguardOptionsFile) @@ -865,7 +865,7 @@ func (a *AndroidLibrary) GenerateAndroidBuildActions(ctx android.ModuleContext) } }) if len(prebuiltJniPackages) > 0 { - ctx.SetProvider(JniPackageProvider, JniPackageInfo{ + android.SetProvider(ctx, JniPackageProvider, JniPackageInfo{ JniPackages: prebuiltJniPackages, }) } @@ -1123,7 +1123,7 @@ func (a *AARImport) GenerateAndroidBuildActions(ctx android.ModuleContext) { aarRTxt := extractedAARDir.Join(ctx, "R.txt") a.assetsPackage = android.PathForModuleOut(ctx, "assets.zip") a.proguardFlags = extractedAARDir.Join(ctx, "proguard.txt") - ctx.SetProvider(ProguardSpecInfoProvider, ProguardSpecInfo{ + android.SetProvider(ctx, ProguardSpecInfoProvider, ProguardSpecInfo{ ProguardFlagsFiles: android.NewDepSet[android.Path]( android.POSTORDER, android.Paths{a.proguardFlags}, @@ -1228,7 +1228,7 @@ func (a *AARImport) GenerateAndroidBuildActions(ctx android.ModuleContext) { a.transitiveAaptResourcePackagesFile = transitiveAaptResourcePackagesFile a.collectTransitiveHeaderJars(ctx) - ctx.SetProvider(JavaInfoProvider, JavaInfo{ + android.SetProvider(ctx, JavaInfoProvider, JavaInfo{ HeaderJars: android.PathsIfNonNil(a.classpathFile), TransitiveLibsHeaderJars: a.transitiveLibsHeaderJars, TransitiveStaticLibsHeaderJars: a.transitiveStaticLibsHeaderJars, @@ -1258,7 +1258,7 @@ func (a *AARImport) GenerateAndroidBuildActions(ctx android.ModuleContext) { } } - ctx.SetProvider(JniPackageProvider, JniPackageInfo{ + android.SetProvider(ctx, JniPackageProvider, JniPackageInfo{ JniPackages: a.jniPackages, }) } |