commit df5ef957cccf044ced40c6ca4989bb40eb21ceed
author Nikita Ioffe <ioffe@google.com> Tue May 26 16:58:20 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue May 26 16:58:20 2020 +0000
tree 9fb6a28569f81a5cbe9799f7ece2636069a321aa
parent 327b94a92a0e99098563147f7e86f6f005238d52
parent 62bd3c7b476b9d4bc2667521c807592e4a8af278

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

Change-Id: I2aae04937917406f12c7446aa5e4349a4aa5d143

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