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

Merge "SdkTestCore for non-updatable modules" into main

Browse Source
This commit is contained in:
Mark White
2023-08-15 21:47:25 +00:00
committed by Android (Google) Code Review
parent 2bd2b1822e beb6e9ffdb
commit 4fac9ea8b2
4 changed files with 45 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
java/sdk_library.go
View File

@@ -459,6 +459,9 @@ type ApiScopeProperties struct {
// or the API file. They both have to use the same sdk_version as is used for
// compiling the implementation library.
Sdk_version *string
// Extra libs used when compiling stubs for this scope.
Libs []string
}
type sdkLibraryProperties struct {
@@ -1642,6 +1645,7 @@ func (module *SdkLibrary) createStubsLibrary(mctx android.DefaultableHookContext
props.Patch_module = module.properties.Patch_module
props.Installable = proptools.BoolPtr(false)
props.Libs = module.sdkLibraryProperties.Stub_only_libs
props.Libs = append(props.Libs, module.scopeToProperties[apiScope].Libs...)
props.Static_libs = module.sdkLibraryProperties.Stub_only_static_libs
// The stub-annotations library contains special versions of the annotations
// with CLASS retention policy, so that they're kept.
@@ -1714,6 +1718,7 @@ func (module *SdkLibrary) createStubsSourcesAndApi(mctx android.DefaultableHookC
props.Libs = module.properties.Libs
props.Libs = append(props.Libs, module.properties.Static_libs...)
props.Libs = append(props.Libs, module.sdkLibraryProperties.Stub_only_libs...)
props.Libs = append(props.Libs, module.scopeToProperties[apiScope].Libs...)
props.Aidl.Include_dirs = module.deviceProperties.Aidl.Include_dirs
props.Aidl.Local_include_dirs = module.deviceProperties.Aidl.Local_include_dirs
props.Java_version = module.properties.Java_version
@@ -1851,6 +1856,7 @@ func (module *SdkLibrary) createApiLibrary(mctx android.DefaultableHookContext,
props.Api_contributions = apiContributions
props.Libs = module.properties.Libs
props.Libs = append(props.Libs, module.sdkLibraryProperties.Stub_only_libs...)
props.Libs = append(props.Libs, module.scopeToProperties[apiScope].Libs...)
props.Libs = append(props.Libs, "stub-annotations")
props.Static_libs = module.sdkLibraryProperties.Stub_only_static_libs
props.Full_api_surface_stub = proptools.StringPtr(apiScope.kind.DefaultJavaLibraryName() + ".from-text")