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

Commit 5a344060 authored by Spandan Das's avatar Spandan Das Committed by Automerger Merge Worker
Browse files

Merge "Generate fsv meta only when PRODUCT_FSVERITY_GENERATE_METADATA is true"... 

Merge "Generate fsv meta only when PRODUCT_FSVERITY_GENERATE_METADATA is true" into main am: 4e305cec

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



Change-Id: I22ef7f271020528fa3eb570e1c875a671df2a697
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 36353a71 4e305cec

android/variable.go

+2 −0
Original line number Diff line number Diff line
@@ -665,6 +665,8 @@ type PartitionVariables struct { 
	VendorRamdiskKernelBlocklistFile string   `json:",omitempty"`

	VendorRamdiskKernelLoadModules   []string `json:",omitempty"`

	VendorRamdiskKernelOptionsFile   string   `json:",omitempty"`



	ProductFsverityGenerateMetadata bool `json:",omitempty"`

}



func boolPtr(v bool) *bool {

fsgen/filesystem_creator.go

+18 −14
Original line number Diff line number Diff line
@@ -212,6 +212,7 @@ func partitionSpecificFsProps(ctx android.EarlyModuleContext, fsProps *filesyste 
		// https://source.corp.google.com/h/googleplex-android/platform/build//639d79f5012a6542ab1f733b0697db45761ab0f3:core/packaging/flags.mk;l=21;drc=5ba8a8b77507f93aa48cc61c5ba3f31a4d0cbf37;bpv=1;bpt=0

		fsProps.Gen_aconfig_flags_pb = proptools.BoolPtr(true)

		// Identical to that of the aosp_shared_system_image

		if partitionVars.ProductFsverityGenerateMetadata {

			fsProps.Fsverity.Inputs = []string{

				"etc/boot-image.prof",

				"etc/dirty-image-objects",
@@ -222,6 +223,7 @@ func partitionSpecificFsProps(ctx android.EarlyModuleContext, fsProps *filesyste 
				"framework/oat/*/*", // framework/oat/{arch}

			}

			fsProps.Fsverity.Libs = []string{":framework-res{.export-package.apk}"}

		}

		// Most of the symlinks and directories listed here originate from create_root_structure.mk,

		// but the handwritten generic system image also recreates them:

		// https://cs.android.com/android/platform/superproject/main/+/main:build/make/target/product/generic/Android.bp;l=33;drc=db08311f1b6ef6cb0a4fbcc6263b89849360ce04
@@ -348,12 +350,14 @@ func partitionSpecificFsProps(ctx android.EarlyModuleContext, fsProps *filesyste 
			"product",

		})

	case "system_ext":

		if partitionVars.ProductFsverityGenerateMetadata {

			fsProps.Fsverity.Inputs = []string{

				"framework/*",

				"framework/*/*",     // framework/{arch}

				"framework/oat/*/*", // framework/oat/{arch}

			}

			fsProps.Fsverity.Libs = []string{":framework-res{.export-package.apk}"}

		}

	case "product":

		fsProps.Gen_aconfig_flags_pb = proptools.BoolPtr(true)

		fsProps.Android_filesystem_deps.System = proptools.StringPtr(generatedModuleNameForPartition(ctx.Config(), "system"))