Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit df5ef957 authored by Nikita Ioffe's avatar Nikita Ioffe Committed by Automerger Merge Worker
Browse files

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

Change-Id: I2aae04937917406f12c7446aa5e4349a4aa5d143
parents 327b94a9 62bd3c7b

apex/builder.go

+1 −1
Original line number Diff line number Diff line
@@ -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) {