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

Commit d86882b5 authored by Spandan Das's avatar Spandan Das
Browse files

Fix fsverity metadata apk name 

The name of the apk installed in kati-built system_ext partition is
`BuildManifestSystemExt.apk`.

Test: Ran the diff_test locally on the autogenerated system_ext
partition

Bug: 372487849
Change-Id: Ic3ff74bbf4ab7064e14b514cf8a96cd89004a86d
parent 130cbf6f

filesystem/fsverity_metadata.go

+8 −2
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 
package filesystem



import (

	"fmt"

	"path/filepath"

	"strings"
@@ -121,8 +122,13 @@ func (f *filesystem) buildFsverityMetadataFiles(ctx android.ModuleContext, build 


	// STEP 2-2: generate BuildManifest.apk (unsigned)

	aapt2Path := ctx.Config().HostToolPath(ctx, "aapt2")

	apkPath := rebasedDir.Join(ctx, "etc", "security", "fsverity", "BuildManifest.apk")

	idsigPath := rebasedDir.Join(ctx, "etc", "security", "fsverity", "BuildManifest.apk.idsig")

	apkNameSuffix := ""

	if f.PartitionType() == "system_ext" {

		//https://source.corp.google.com/h/googleplex-android/platform/build/+/e392d2b486c2d4187b20a72b1c67cc737ecbcca5:core/Makefile;l=3410;drc=ea8f34bc1d6e63656b4ec32f2391e9d54b3ebb6b;bpv=1;bpt=0

		apkNameSuffix = "SystemExt"

	}

	apkPath := rebasedDir.Join(ctx, "etc", "security", "fsverity", fmt.Sprintf("BuildManifest%s.apk", apkNameSuffix))

	idsigPath := rebasedDir.Join(ctx, "etc", "security", "fsverity", fmt.Sprintf("BuildManifest%s.apk.idsig", apkNameSuffix))

	manifestTemplatePath := android.PathForSource(ctx, "system/security/fsverity/AndroidManifest.xml")

	libs := android.PathsForModuleSrc(ctx, f.properties.Fsverity.Libs)

	cmd.Implicit(aapt2Path)