diff options
| author | 2023-04-03 23:27:25 +0000 | |
|---|---|---|
| committer | 2023-04-03 23:42:08 +0000 | |
| commit | 760f8804952c6a344236b472dd9232febafb004d (patch) | |
| tree | c8c1d974d2677d5f01767cc91e30e764af13d73e /java/sdk.go | |
| parent | 0cb803a5d6bc113757120259298b46e630854c11 (diff) | |
Create core-lambda-stubs from .txt files
APIs to compile lambda are part of art's toolchain api surface.
Generating stubs from .txt files allows us to prune the remaining sdk
dependencies on libcore/ that are not api files
Test: m core-lambda-stubs.from-text
(On top of change containing core.current.stubs.from-text
and turning enabled: true)
Change-Id: I0ab8459b9317cb055a434eb635ba06d38da5b92e
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 1b18ba40a..8b4918add 100644 --- a/java/sdk.go +++ b/java/sdk.go @@ -151,7 +151,7 @@ func decodeSdkDep(ctx android.EarlyModuleContext, sdkContext android.SdkContext) systemModules := android.JavaApiLibraryName(ctx.Config(), fmt.Sprintf("core-%s-stubs-system-modules", systemModulesKind)) return sdkDep{ useModule: true, - bootclasspath: []string{module, config.DefaultLambdaStubsLibrary}, + bootclasspath: []string{module, android.JavaApiLibraryName(ctx.Config(), config.DefaultLambdaStubsLibrary)}, systemModules: systemModules, java9Classpath: []string{module}, frameworkResModule: "framework-res", @@ -197,7 +197,7 @@ func decodeSdkDep(ctx android.EarlyModuleContext, sdkContext android.SdkContext) case android.SdkCore: return sdkDep{ useModule: true, - bootclasspath: []string{android.SdkCore.JavaLibraryName(ctx.Config()), config.DefaultLambdaStubsLibrary}, + bootclasspath: []string{android.SdkCore.JavaLibraryName(ctx.Config()), android.JavaApiLibraryName(ctx.Config(), config.DefaultLambdaStubsLibrary)}, systemModules: android.JavaApiLibraryName(ctx.Config(), "core-public-stubs-system-modules"), noFrameworksLibs: true, } |