Merge "Always set targetSdkLevel to DefaultAppTargetSdk" am: 62bd3c7b47

Change-Id: I2aae04937917406f12c7446aa5e4349a4aa5d143
This commit is contained in:
Nikita Ioffe
2020-05-26 16:58:20 +00:00
committed by Automerger Merge Worker

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) {