From b73c3a6d221523f06d30c15145866056556187d0 Mon Sep 17 00:00:00 2001 From: Yu Liu Date: Tue, 10 Dec 2024 00:58:06 +0000 Subject: Convert checkApexAvailability to use ModuleProxy. Bug: 377723687 Test: Unit tests and compare the ninja and mk files generated. Change-Id: I7582db8e22e94d0a9db7715a76bb6ed34c166a4e --- java/sdk_library_internal.go | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'java/sdk_library_internal.go') diff --git a/java/sdk_library_internal.go b/java/sdk_library_internal.go index 768e57a11..ec9c160ea 100644 --- a/java/sdk_library_internal.go +++ b/java/sdk_library_internal.go @@ -15,12 +15,13 @@ package java import ( - "android/soong/android" - "android/soong/etc" "fmt" "path" "strings" + "android/soong/android" + "android/soong/etc" + "github.com/google/blueprint/proptools" ) @@ -778,7 +779,11 @@ var _ etc.PrebuiltEtcModule = (*sdkLibraryXml)(nil) // from android.ApexModule func (module *sdkLibraryXml) AvailableFor(what string) bool { - return true + return android.CheckAvailableForApex(what, module.ApexAvailableFor()) +} + +func (module *sdkLibraryXml) ApexAvailableFor() []string { + return []string{android.AvailableToPlatform, android.AvailableToAnyApex} } func (module *sdkLibraryXml) DepsMutator(ctx android.BottomUpMutatorContext) { -- cgit v1.2.3-59-g8ed1b