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

java_sdk_library: Add sdk_version for API scopes

Browse Source 
Allow the sdk_version against which the stubs for a scope are compiled
to be specified in the module on a per scope basis.

Bug: 155164730
Test: m nothing
Change-Id: I5881e5ee7c2169c30f544882344a60a602dae917
This commit is contained in:
Paul Duffin
2020-05-12 11:50:28 +01:00
parent 717e50c630
commit 87a05a389d
3 changed files with 98 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
java/sdk_library.go
View File

@@ -320,6 +320,22 @@ type ApiScopeProperties struct {
// Otherwise, if this is not set for any scope then the default behavior is
// scope specific so please refer to the scope specific property documentation.
Enabled *bool
// The sdk_version to use for building the stubs.
//
// If not specified then it will use an sdk_version determined as follows:
// 1) If the sdk_version specified on the java_sdk_library is none then this
// will be none. This is used for java_sdk_library instances that are used
// to create stubs that contribute to the core_current sdk version.
// 2) Otherwise, it is assumed that this library extends but does not contribute
// directly to a specific sdk_version and so this uses the sdk_version appropriate
// for the api scope. e.g. public will use sdk_version: current, system will use
// sdk_version: system_current, etc.
//
// This does not affect the sdk_version used for either generating the stubs source
// or the API file. They both have to use the same sdk_version as is used for
// compiling the implementation library.
Sdk_version *string
}
type sdkLibraryProperties struct {
@@ -701,6 +717,11 @@ func (module *SdkLibrary) apiDistPath(apiScope *apiScope) string {
// Get the sdk version for use when compiling the stubs library.
func (module *SdkLibrary) sdkVersionForStubsLibrary(mctx android.EarlyModuleContext, apiScope *apiScope) string {
scopeProperties := module.scopeToProperties[apiScope]
if scopeProperties.Sdk_version != nil {
return proptools.String(scopeProperties.Sdk_version)
}
sdkDep := decodeSdkDep(mctx, sdkContext(&module.Library))
if sdkDep.hasStandardLibs() {
// If building against a standard sdk then use the sdk version appropriate for the scope.