diff options
| author | 2023-06-14 22:43:25 +0000 | |
|---|---|---|
| committer | 2023-06-15 19:42:34 +0000 | |
| commit | 6c0df888094915e32955c2b175b29c020104d07c (patch) | |
| tree | 7479b740ef66cfaa03a2b0afed73932ab757ee13 /java/sdk.go | |
| parent | 3d4d88d68e5b5796cf4d9d236793df5322a1eab5 (diff) | |
Cleanup remaining android.JavaApiLibraryName() references
Since the name of the java_library generated from sdk_library per api
scope does not depend on the build configuration anymore, all
dependency switching "magic" via android.JavaApiLibraryName() can be
removed.
This change also removes from-text-build-specific test cases, as those
test cases depend on build configurations.
Test: m nothing && m nothing --build-from-text-stub
Bug: 287340610
Change-Id: I3bac35259e0cbaa16432a46cb2b128951c9bc075
Diffstat (limited to 'java/sdk.go')
| -rw-r--r-- | java/sdk.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/java/sdk.go b/java/sdk.go index 7699aabe0..7c702c405 100644 --- a/java/sdk.go +++ b/java/sdk.go @@ -148,7 +148,7 @@ func decodeSdkDep(ctx android.EarlyModuleContext, sdkContext android.SdkContext) toModule := func(module string, aidl android.Path) sdkDep { // Select the kind of system modules needed for the sdk version. systemModulesKind := systemModuleKind(sdkVersion.Kind, android.FutureApiLevel) - systemModules := android.JavaApiLibraryName(ctx.Config(), fmt.Sprintf("core-%s-stubs-system-modules", systemModulesKind)) + systemModules := fmt.Sprintf("core-%s-stubs-system-modules", systemModulesKind) return sdkDep{ useModule: true, bootclasspath: []string{module, config.DefaultLambdaStubsLibrary}, @@ -198,7 +198,7 @@ func decodeSdkDep(ctx android.EarlyModuleContext, sdkContext android.SdkContext) return sdkDep{ useModule: true, bootclasspath: []string{android.SdkCore.DefaultJavaLibraryName(), config.DefaultLambdaStubsLibrary}, - systemModules: android.JavaApiLibraryName(ctx.Config(), "core-public-stubs-system-modules"), + systemModules: "core-public-stubs-system-modules", noFrameworksLibs: true, } case android.SdkModule: |