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

Commit 72f361f5 authored by Seungjae Yoo's avatar Seungjae Yoo Committed by Automerger Merge Worker
Browse files

Merge "Add security_patch avb property for android_filesystem" into main am:... 

Merge "Add security_patch avb property for android_filesystem" into main am: 54c63ac0 am: 7cf73b37

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



Change-Id: I6965e1023a44a8bd159b1b97746af530311b8260
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents dbf01bbb 7cf73b37

filesystem/filesystem.go

+5 −2
Original line number Diff line number Diff line
@@ -350,13 +350,16 @@ func (f *filesystem) buildPropFile(ctx android.ModuleContext) (propFile android. 
		addStr("avb_algorithm", algorithm)

		key := android.PathForModuleSrc(ctx, proptools.String(f.properties.Avb_private_key))

		addPath("avb_key_path", key)

		partitionName := proptools.StringDefault(f.properties.Partition_name, f.Name())

		addStr("partition_name", partitionName)

		avb_add_hashtree_footer_args := "--do_not_generate_fec"

		if hashAlgorithm := proptools.String(f.properties.Avb_hash_algorithm); hashAlgorithm != "" {

			avb_add_hashtree_footer_args += " --hash_algorithm " + hashAlgorithm

		}

		securityPatchKey := "com.android.build." + partitionName + ".security_patch"

		securityPatchValue := ctx.Config().PlatformSecurityPatch()

		avb_add_hashtree_footer_args += " --prop " + securityPatchKey + ":" + securityPatchValue

		addStr("avb_add_hashtree_footer_args", avb_add_hashtree_footer_args)

		partitionName := proptools.StringDefault(f.properties.Partition_name, f.Name())

		addStr("partition_name", partitionName)

		addStr("avb_salt", f.salt())

	}