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

Commit 67a7ab89 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Stop ignoring the targetSdkVersion when it includes the API fingerprint SHA"

parents 357ebe5e aa2aad6d

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)