commit 644009a22139611aed1b8df299f636f2ee3513c9
author Nikita Ioffe <ioffe@google.com> Wed May 20 00:16:27 2020 +0100
committer Nikita Ioffe <ioffe@google.com> Wed May 20 13:57:05 2020 +0100
tree c281ac0fe9198b7ab40b6874f3cd06e01498e717
parent 7bdb5e5aaa41d83c86416609f2debba78e47a0b7

Always set targetSdkLevel to DefaultAppTargetSdk

Test: m
Bug: 156914912
Merged-In: Ibe63352c2fc474dd816d87ac79b31a56d32b35d2
Change-Id: Ibe63352c2fc474dd816d87ac79b31a56d32b35d2
(cherry picked from commit 5f6771e160df241a0d2a1f1d8fbcea77767e3406)

apex/builder.go

diff --git a/apex/builder.go b/apex/builder.go
index 3d0e9b2..11652bc 100644
--- a/apex/builder.go
+++ b/apex/builder.go
@@ -470,11 +470,11 @@
 		}
 
 		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) {