StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge changes I0ab8459b,I2ef90f4d

Browse Source 
* changes:
  Create core-lambda-stubs from .txt files
  Fix the suffix used in names of java_system_modules
This commit is contained in:
Treehugger Robot
2023-04-04 17:54:56 +00:00
committed by Gerrit Code Review
parent 32952b975d 760f880495
commit 28ba80665d
2 changed files with 22 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
java/core-libraries/TxtStubLibraries.bp
View File

@@ -33,8 +33,8 @@ java_library {
"system-modules-no-annotations", "system-modules-no-annotations",
], ],
static_libs: [ static_libs: [
"core.current.stubs.from-txt", "core.current.stubs.from-text",
"core-lambda-stubs-for-system-modules", "core-lambda-stubs.from-text",
], ],
// TODO: Enable after stub generation from .txt file is available // TODO: Enable after stub generation from .txt file is available
enabled: false, enabled: false,
@@ -58,8 +58,8 @@ java_library {
"system-modules-no-annotations", "system-modules-no-annotations",
], ],
static_libs: [ static_libs: [
"core.module_lib.stubs.txt", "core.module_lib.stubs.from-text",
"core-lambda-stubs-for-system-modules", "core-lambda-stubs.from-text",
], ],
// TODO: Enable after stub generation from .txt file is available // TODO: Enable after stub generation from .txt file is available
enabled: false, enabled: false,
@@ -89,7 +89,7 @@ java_system_modules {
visibility: core_platform_visibility, visibility: core_platform_visibility,
libs: [ libs: [
"legacy.core.platform.api.no.annotations.stubs.from-text", "legacy.core.platform.api.no.annotations.stubs.from-text",
"core-lambda-stubs-for-system-modules", "core-lambda-stubs.from-text",
], ],
// TODO: Enable after stub generation from .txt file is available // TODO: Enable after stub generation from .txt file is available
enabled: false, enabled: false,
@@ -118,7 +118,7 @@ java_system_modules {
visibility: core_platform_visibility, visibility: core_platform_visibility,
libs: [ libs: [
"stable.core.platform.api.no.annotations.stubs.from-text", "stable.core.platform.api.no.annotations.stubs.from-text",
"core-lambda-stubs-for-system-modules", "core-lambda-stubs.from-text",
], ],
// TODO: Enable after stub generation from .txt file is available // TODO: Enable after stub generation from .txt file is available
enabled: false, enabled: false,
@@ -140,3 +140,17 @@ java_library {
// TODO: Enable after stub generation from .txt file is available // TODO: Enable after stub generation from .txt file is available
enabled: false, enabled: false,
} }
java_api_library {
name: "core-lambda-stubs.from-text",
api_surface: "toolchain",
api_contributions: [
"art.module.toolchain.api.api.contribution",
],
libs: [
// LambdaMetaFactory depends on CallSite etc. which is part of the Core API surface
"core.current.stubs.from-text",
],
// TODO: Enable after stub generation from .txt file is available
enabled: false,
}

4
java/sdk.go
View File

@@ -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)) systemModules := android.JavaApiLibraryName(ctx.Config(), fmt.Sprintf("core-%s-stubs-system-modules", systemModulesKind))
return sdkDep{ return sdkDep{
useModule: true, useModule: true,
bootclasspath: []string{module, config.DefaultLambdaStubsLibrary}, bootclasspath: []string{module, android.JavaApiLibraryName(ctx.Config(), config.DefaultLambdaStubsLibrary)},
systemModules: systemModules, systemModules: systemModules,
java9Classpath: []string{module}, java9Classpath: []string{module},
frameworkResModule: "framework-res", frameworkResModule: "framework-res",
@@ -197,7 +197,7 @@ func decodeSdkDep(ctx android.EarlyModuleContext, sdkContext android.SdkContext)
case android.SdkCore: case android.SdkCore:
return sdkDep{ return sdkDep{
useModule: true, 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"), systemModules: android.JavaApiLibraryName(ctx.Config(), "core-public-stubs-system-modules"),
noFrameworksLibs: true, noFrameworksLibs: true,
} }