Merge "Always set targetSdkLevel to DefaultAppTargetSdk" into rvc-dev
This commit is contained in:
commit
b029f03191
1 changed files with 1 additions and 1 deletions
|
@ -445,11 +445,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) {
|
||||||
|
|
Loading…
Reference in a new issue