From 644009a22139611aed1b8df299f636f2ee3513c9 Mon Sep 17 00:00:00 2001 From: Nikita Ioffe Date: Wed, 20 May 2020 00:16:27 +0100 Subject: [PATCH] Always set targetSdkLevel to DefaultAppTargetSdk Test: m Bug: 156914912 Merged-In: Ibe63352c2fc474dd816d87ac79b31a56d32b35d2 Change-Id: Ibe63352c2fc474dd816d87ac79b31a56d32b35d2 (cherry picked from commit 5f6771e160df241a0d2a1f1d8fbcea77767e3406) --- apex/builder.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apex/builder.go b/apex/builder.go index 3d0e9b254..11652bc67 100644 --- a/apex/builder.go +++ b/apex/builder.go @@ -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) {