From 7bc1cf508f8d730c852736ab77470a7be9af9988 Mon Sep 17 00:00:00 2001 From: Ulya Trafimovich Date: Tue, 5 Jan 2021 15:41:55 +0000 Subject: Remove obsolete class loader context API and update unit tests. The removed API has been unused since https://r.android.com/1533342 (except for unit tests). Changes in the unit tests reflect the change of API in https://r.android.com/1533342: early errors caused by unknown library paths at CLC construction time have been replaced with late errors at the time of CLC validation. Bug: 132357300 Test: m nothing Change-Id: I739c7c41b6f882b7e28cdd6acd05961d754d8687 --- java/java.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'java/java.go') diff --git a/java/java.go b/java/java.go index 18dd9bda4..145f6c9a5 100644 --- a/java/java.go +++ b/java/java.go @@ -3300,7 +3300,7 @@ func addCLCFromDep(ctx android.ModuleContext, depModule android.Module, } if implicitSdkLib != nil { - clcMap.AddContextForSdk(ctx, dexpreopt.AnySdkVersion, *implicitSdkLib, + clcMap.AddContext(ctx, dexpreopt.AnySdkVersion, *implicitSdkLib, dep.DexJarBuildPath(), dep.DexJarInstallPath(), dep.ClassLoaderContexts()) } else { depName := ctx.OtherModuleName(depModule) -- cgit v1.2.3-59-g8ed1b