From e1676121153483c05c2ff031c0f25dfd817e3234 Mon Sep 17 00:00:00 2001 From: Cole Faust Date: Tue, 3 Dec 2024 17:32:25 -0800 Subject: Fixes for avb flags in soong-generated partitions The logic for what variables control what aspect of AVB is pretty complicated, this brings make and soong closer together. Bug: 381120092 Test: m out/soong/.intermediates/build/soong/fsgen/aosp_cf_x86_64_phone_generated_system_image/android_common/prop, diff with make's prop file Change-Id: I6ada90262f4578d120c35b7f8d38c06c2b1d9c27 --- filesystem/filesystem_test.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'filesystem/filesystem_test.go') diff --git a/filesystem/filesystem_test.go b/filesystem/filesystem_test.go index 72a52111c..86496eb6e 100644 --- a/filesystem/filesystem_test.go +++ b/filesystem/filesystem_test.go @@ -593,7 +593,7 @@ func TestErofsPartition(t *testing.T) { `) partition := result.ModuleForTests("erofs_partition", "android_common") - buildImageConfig := android.ContentFromFileRuleForTests(t, result.TestContext, partition.Output("prop")) + buildImageConfig := android.ContentFromFileRuleForTests(t, result.TestContext, partition.Output("prop_pre_processing")) android.AssertStringDoesContain(t, "erofs fs type", buildImageConfig, "fs_type=erofs") android.AssertStringDoesContain(t, "erofs fs type compress algorithm", buildImageConfig, "erofs_default_compressor=lz4hc,9") android.AssertStringDoesContain(t, "erofs fs type compress hint", buildImageConfig, "erofs_default_compress_hints=compress_hints.txt") @@ -609,7 +609,7 @@ func TestF2fsPartition(t *testing.T) { `) partition := result.ModuleForTests("f2fs_partition", "android_common") - buildImageConfig := android.ContentFromFileRuleForTests(t, result.TestContext, partition.Output("prop")) + buildImageConfig := android.ContentFromFileRuleForTests(t, result.TestContext, partition.Output("prop_pre_processing")) android.AssertStringDoesContain(t, "f2fs fs type", buildImageConfig, "fs_type=f2fs") android.AssertStringDoesContain(t, "f2fs fs type sparse", buildImageConfig, "f2fs_sparse_flag=-S") } -- cgit v1.2.3-59-g8ed1b