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

Commit 2669e7ed authored by Colin Cross's avatar Colin Cross
Browse files

Exempt framework-res from UseApiFingerprint 

Generating the API fingerpring depends on framework-res, so the
fingerprint cannot be embedded into framework-res.  Hardcode an
exemption to UseApiFingerprint.

Bug: 181978889
Test: TARGET_BUILD_VARIANT=user UNBUNDLED_BUILD_TARGET_SDK_WITH_API_FINGERPRINT=true vendor/google/build/build_mainline_modules.sh
Change-Id: I621f36d5eb157dd97baa132ff109b4df791eedcc
parent b48f9aef

java/android_manifest.go

+2 −2
Original line number Diff line number Diff line
@@ -91,7 +91,7 @@ func manifestFixer(ctx android.ModuleContext, manifest android.Path, sdkContext 
	if err != nil {

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

	}

	if UseApiFingerprint(ctx) {

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

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

		deps = append(deps, ApiFingerprintPath(ctx))

	}
@@ -100,7 +100,7 @@ func manifestFixer(ctx android.ModuleContext, manifest android.Path, sdkContext 
	if err != nil {

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

	}

	if UseApiFingerprint(ctx) {

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

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

		deps = append(deps, ApiFingerprintPath(ctx))

	}