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

Utilize from text core platform api surface jar in build

Browse Source 
Use JavaApiLibraryName function to redirect the usage
of core platform api stubs from .txt files based on config.

Test: m --build-from-text-stub
Change-Id: I926a0a455fed301ba4ff9dfa509d4dbbbd076029
This commit is contained in:
Jihoon Kang
2023-03-29 23:25:49 +00:00
parent 7bfe443875
commit b507831b71
6 changed files with 27 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
java/base.go
View File

@@ -1923,9 +1923,12 @@ type moduleWithSdkDep interface {
func (m *Module) getSdkLinkType(ctx android.BaseModuleContext, name string) (ret sdkLinkType, stubs bool) {
switch name {
case android.SdkCore.JavaLibraryName(ctx.Config()), "legacy.core.platform.api.stubs", "stable.core.platform.api.stubs",
case android.SdkCore.JavaLibraryName(ctx.Config()),
android.JavaApiLibraryName(ctx.Config(), "legacy.core.platform.api.stubs"),
android.JavaApiLibraryName(ctx.Config(), "stable.core.platform.api.stubs"),
"stub-annotations", "private-stub-annotations-jar",
"core-lambda-stubs", "core-generated-annotation-stubs":
android.JavaApiLibraryName(ctx.Config(), "core-lambda-stubs"),
"core-generated-annotation-stubs":
return javaCore, true
case android.SdkPublic.JavaLibraryName(ctx.Config()):
return javaSdk, true