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

Commit cf30cfb0 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... 

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

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



Change-Id: Id49f8e342e19988acffa751a588219a5e70e5e6c
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents b0c62e6c bc7be1ac

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)