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

Commit bc7be1ac authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Stop ignoring the targetSdkVersion when it includes the API fingerprint SHA" am: 67a7ab89 

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2411278



Change-Id: If16ba6ae65a899c816f1b1ebd72823369c9cb8db
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 61734dfb 67a7ab89

java/android_manifest.go

+2 −1
Original line number Diff line number Diff line
@@ -149,13 +149,14 @@ func ManifestFixer(ctx android.ModuleContext, manifest android.Path, 


	if params.SdkContext != nil {

		targetSdkVersion := targetSdkVersionForManifestFixer(ctx, params)

		args = append(args, "--targetSdkVersion ", targetSdkVersion)



		if UseApiFingerprint(ctx) && ctx.ModuleName() != "framework-res" {

			targetSdkVersion = ctx.Config().PlatformSdkCodename() + fmt.Sprintf(".$$(cat %s)", ApiFingerprintPath(ctx).String())

			deps = append(deps, ApiFingerprintPath(ctx))

		}



		args = append(args, "--targetSdkVersion ", targetSdkVersion)



		minSdkVersion, err := params.SdkContext.MinSdkVersion(ctx).EffectiveVersionString(ctx)

		if err != nil {

			ctx.ModuleErrorf("invalid minSdkVersion: %s", err)