openkylin
/
platform_build_soong
mirror of https://gitee.com/openkylin/platform_build_soong.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge "Always set targetSdkLevel to DefaultAppTargetSdk"

This commit is contained in:
Nikita Ioffe 2020-05-26 16:47:42 +00:00 committed by Gerrit Code Review
parent 3f82e2426e 644009a221
commit 62bd3c7b47
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apex/builder.go
View File

@ -470,11 +470,11 @@ func (a *apexBundle) buildUnflattenedApex(ctx android.ModuleContext) {
} }
targetSdkVersion := ctx.Config().DefaultAppTargetSdk() targetSdkVersion := ctx.Config().DefaultAppTargetSdk()
// TODO(b/157078772): propagate min_sdk_version to apexer.
minSdkVersion := ctx.Config().DefaultAppTargetSdk() minSdkVersion := ctx.Config().DefaultAppTargetSdk()
if a.minSdkVersion(ctx) == android.SdkVersion_Android10 { if a.minSdkVersion(ctx) == android.SdkVersion_Android10 {
minSdkVersion = strconv.Itoa(a.minSdkVersion(ctx)) minSdkVersion = strconv.Itoa(a.minSdkVersion(ctx))
targetSdkVersion = strconv.Itoa(a.minSdkVersion(ctx))
} }
if java.UseApiFingerprint(ctx) { if java.UseApiFingerprint(ctx) {