summaryrefslogtreecommitdiff
path: root/java/aar.go
diff options
context:
space:
mode:
author Colin Cross <ccross@android.com> 2023-12-13 15:54:49 -0800
committer Colin Cross <ccross@android.com> 2023-12-14 16:12:21 -0800
commitff694a8c88c632559c72653edf99f21c3d761dee (patch)
treea0b6c2a6cda60be82412b377d15d0a9b86eca065 /java/aar.go
parent402130276c75fd967dcae894bd363edc3050d205 (diff)
Convert Provider to generic providers API
Convert all of the callers of Provider/HasProvider to use the type-safe android.ModuleProvider API. Bug: 316410648 Test: builds Change-Id: I73479de1625fa2865b6c73444cd477e50d56dc5a
Diffstat (limited to 'java/aar.go')
-rw-r--r--java/aar.go6
1 files changed, 4 insertions, 2 deletions
diff --git a/java/aar.go b/java/aar.go
index f7c8367d0..1a9da235d 100644
--- a/java/aar.go
+++ b/java/aar.go
@@ -805,7 +805,8 @@ func (a *AndroidLibrary) GenerateAndroidBuildActions(ctx android.ModuleContext)
},
)
- a.hideApexVariantFromMake = !ctx.Provider(android.ApexInfoProvider).(android.ApexInfo).IsForPlatform()
+ apexInfo, _ := android.ModuleProvider(ctx, android.ApexInfoProvider)
+ a.hideApexVariantFromMake = !apexInfo.IsForPlatform()
a.stem = proptools.StringDefault(a.overridableDeviceProperties.Stem, ctx.ModuleName())
@@ -1106,7 +1107,8 @@ func (a *AARImport) GenerateAndroidBuildActions(ctx android.ModuleContext) {
a.sdkVersion = a.SdkVersion(ctx)
a.minSdkVersion = a.MinSdkVersion(ctx)
- a.hideApexVariantFromMake = !ctx.Provider(android.ApexInfoProvider).(android.ApexInfo).IsForPlatform()
+ apexInfo, _ := android.ModuleProvider(ctx, android.ApexInfoProvider)
+ a.hideApexVariantFromMake = !apexInfo.IsForPlatform()
aarName := ctx.ModuleName() + ".aar"
a.aarPath = android.PathForModuleSrc(ctx, a.properties.Aars[0])