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

Commit 62bd3c7b authored by Nikita Ioffe's avatar Nikita Ioffe Committed by Gerrit Code Review
Browse files

Merge "Always set targetSdkLevel to DefaultAppTargetSdk"

parents 3f82e242 644009a2

apex/builder.go

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