From 98e9ac6075d23ac9e06e87bf881bebccbef4505c Mon Sep 17 00:00:00 2001 From: Jihoon Kang Date: Wed, 25 Sep 2024 23:42:30 +0000 Subject: Remove the SdkLibraryDependency interface Instead, provide the information of the source/prebuilt java_sdk_library to the rdeps via the SdkLibraryInfoProvider. Test: m nothing --no-skip-soong-tests && diff ninja file Bug: 348040422 Change-Id: If6cd3cd260a8ce8dccead7f302840cabf68a9fae --- sdk/java_sdk_test.go | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'sdk/java_sdk_test.go') diff --git a/sdk/java_sdk_test.go b/sdk/java_sdk_test.go index 09a7c9e8c..15e13dbcb 100644 --- a/sdk/java_sdk_test.go +++ b/sdk/java_sdk_test.go @@ -1360,10 +1360,9 @@ java_sdk_library_import { } `), snapshotTestChecker(checkSnapshotWithSourcePreferred, func(t *testing.T, result *android.TestResult) { - ctx := android.ModuleInstallPathContextForTesting(result.Config) dexJarBuildPath := func(name string, kind android.SdkKind) string { - dep := result.Module(name, "android_common").(java.SdkLibraryDependency) - path := dep.SdkApiExportableStubDexJar(ctx, kind).Path() + sdkLibInfo, _ := android.OtherModuleProvider(result.TestContext.OtherModuleProviderAdaptor(), result.Module(name, "android_common"), java.SdkLibraryInfoProvider) + path := sdkLibInfo.ExportableStubDexJarPaths[kind].Path() return path.RelativeToTop().String() } -- cgit v1.2.3-59-g8ed1b