Merge "Always set targetSdkLevel to DefaultAppTargetSdk" into rvc-dev am: b029f03191

Change-Id: Id51826d589e55295b235dbb315e64e15ab52a4ca
This commit is contained in:
Nikita Ioffe 2020-05-20 10:56:32 +00:00 committed by Automerger Merge Worker
commit 5d1c06c922
1 changed files with 1 additions and 1 deletions

View File

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