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

java_sdk_library use prebuilt jars for numeric sdk_version

Browse Source 
Previously, when a library that used a numeric sdk version also
referenced a java_sdk_library it would use the current version of its
API. That was dangerous as there is an expectation that an app building
against a numbered version will also be targeted at that version and
so building against a later version of the API could hide runtime
incompatibilities.

This change will use prebuilt versions of the java_sdk_library's api
when being built for a numbered sdk version.

Bug: 148080325
Test: m droid
Change-Id: I3fd416553950785a443c1702e495a96debc33331
This commit is contained in:
Paul Duffin
2020-01-22 17:11:15 +00:00
parent 1b57531573
commit a2db18fb1e
3 changed files with 17 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
java/sdk_library.go
View File

@@ -683,8 +683,9 @@ func (module *SdkLibrary) sdkJars(
sdkVersion sdkSpec,
headerJars bool) android.Paths {
// This module is just a wrapper for the stubs.
if ctx.Config().UnbundledBuildUsePrebuiltSdks() {
// If a specific numeric version has been requested or the build is explicitly configured
// for it then use prebuilt versions of the sdk.
if sdkVersion.version.isNumbered() || ctx.Config().UnbundledBuildUsePrebuiltSdks() {
return module.PrebuiltJars(ctx, sdkVersion)
} else {
if !sdkVersion.specified() {