From f1153bd2f8a150711b7bfbd54b96667861cc7382 Mon Sep 17 00:00:00 2001 From: Spandan Das Date: Mon, 24 Mar 2025 21:08:48 +0000 Subject: Build and dist updatepackage Equivalent make code: https://cs.android.com/android/_/android/platform/build/+/577341036beabe1cf4dcc479b254b878b8963b8d:core/Makefile;l=7593-7620;drc=577341036beabe1cf4dcc479b254b878b8963b8d;bpv=1;bpt=0 Some custom partitions are not included in the updatepackage. Make determines by looking at a board config variable. To implement this exclusion in Soong, a new `No_flashall` property has been added to `android_filesystem`. Bug: 383902856 Test: Built img.zip files for both make and soong Test: verified that they contain the same no. of files. Change-Id: If4df40a7ceb2ef68de27fb44f9e8db4503695e4e --- filesystem/filesystem.go | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'filesystem/filesystem.go') diff --git a/filesystem/filesystem.go b/filesystem/filesystem.go index 61b731ab2..0b17025b4 100644 --- a/filesystem/filesystem.go +++ b/filesystem/filesystem.go @@ -249,6 +249,10 @@ type FilesystemProperties struct { // Whether to enable per-file compression in f2fs Enable_compression *bool + + // Whether this partition is not supported by flashall. + // If true, this partition will not be included in the `updatedpackage` dist artifact. + No_flashall *bool } type AndroidFilesystemDeps struct { @@ -464,6 +468,7 @@ type FilesystemInfo struct { AvbHashAlgorithm string AvbKey android.Path PartitionName string + NoFlashall bool // HasOrIsRecovery returns true for recovery and for ramdisks with a recovery partition. HasOrIsRecovery bool } @@ -725,6 +730,7 @@ func (f *filesystem) GenerateAndroidBuildActions(ctx android.ModuleContext) { PartitionSize: f.properties.Partition_size, PartitionName: f.partitionName(), HasOrIsRecovery: f.hasOrIsRecovery(ctx), + NoFlashall: proptools.Bool(f.properties.No_flashall), } if proptools.Bool(f.properties.Use_avb) { fsInfo.UseAvb = true -- cgit v1.2.3-59-g8ed1b