Always set targetSdkLevel to DefaultAppTargetSdk
Test: m
Bug: 156914912
Merged-In: Ibe63352c2fc474dd816d87ac79b31a56d32b35d2
Change-Id: Ibe63352c2fc474dd816d87ac79b31a56d32b35d2
(cherry picked from commit 5f6771e160
)
This commit is contained in:
parent
7bdb5e5aaa
commit
644009a221
|
@ -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) {
|
||||||
|
|
Loading…
Reference in New Issue