From ef9e63e775493bd73cb28917ad59e6b10e5506b5 Mon Sep 17 00:00:00 2001 From: Yu Liu Date: Tue, 4 Mar 2025 19:01:28 +0000 Subject: Rename CommonModuleInfoKey to be consistent with others. Bug: 377723687 Test: Unit tests and compare the ninja and mk files generated. Change-Id: I1ce8bc782666586633ded9cfaf1b9590e3c0efde --- apex/builder.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'apex/builder.go') diff --git a/apex/builder.go b/apex/builder.go index 2fc4902fb..6c500de8d 100644 --- a/apex/builder.go +++ b/apex/builder.go @@ -1111,7 +1111,7 @@ func (a *apexBundle) buildApexDependencyInfo(ctx android.ModuleContext) { // Skip dependencies that are only available to APEXes; they are developed with updatability // in mind and don't need manual approval. - if android.OtherModuleProviderOrDefault(ctx, to, android.CommonModuleInfoKey).NotAvailableForPlatform { + if android.OtherModuleProviderOrDefault(ctx, to, android.CommonModuleInfoProvider).NotAvailableForPlatform { return !externalDep } @@ -1129,7 +1129,7 @@ func (a *apexBundle) buildApexDependencyInfo(ctx android.ModuleContext) { depInfos[to.Name()] = info } else { toMinSdkVersion := "(no version)" - if info, ok := android.OtherModuleProvider(ctx, to, android.CommonModuleInfoKey); ok && + if info, ok := android.OtherModuleProvider(ctx, to, android.CommonModuleInfoProvider); ok && !info.MinSdkVersion.IsPlatform && info.MinSdkVersion.ApiLevel != nil { toMinSdkVersion = info.MinSdkVersion.ApiLevel.String() } -- cgit v1.2.3-59-g8ed1b