From df0b83966161d767714909dff032648c0d83d4c8 Mon Sep 17 00:00:00 2001 From: Yu Liu Date: Wed, 12 Feb 2025 18:27:03 +0000 Subject: Convert CheckMinSdkVersion to use providers. Next step is to convert it to use ModuleProxy once IsDepInSameApex is converted to use providers. Bug: 377723687 Test: Unit tests and compare the ninja and mk files generated. Change-Id: I20cb052666fa95eb964e63e3302ac892d3324183 --- java/sdk_library.go | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'java/sdk_library.go') diff --git a/java/sdk_library.go b/java/sdk_library.go index fafb44801..cf31b5095 100644 --- a/java/sdk_library.go +++ b/java/sdk_library.go @@ -931,6 +931,8 @@ type commonSdkLibraryAndImportModule interface { RootLibraryName() string } +var _ android.ApexModule = (*SdkLibrary)(nil) + func (m *SdkLibrary) RootLibraryName() string { return m.BaseModuleName() } @@ -2153,13 +2155,10 @@ func (m SdkLibraryImportDepIsInSameApexChecker) OutgoingDepIsInSameApex(tag blue } // Implements android.ApexModule -func (module *SdkLibraryImport) ShouldSupportSdkVersion(ctx android.BaseModuleContext, - sdkVersion android.ApiLevel) error { - // we don't check prebuilt modules for sdk_version - return nil +func (m *SdkLibraryImport) MinSdkVersionSupported(ctx android.BaseModuleContext) android.ApiLevel { + return android.MinApiLevel } -// Implements android.ApexModule func (module *SdkLibraryImport) UniqueApexVariations() bool { return module.uniqueApexVariations() } -- cgit v1.2.3-59-g8ed1b