diff options
| author | 2025-02-12 01:32:21 +0000 | |
|---|---|---|
| committer | 2025-02-12 17:33:48 +0000 | |
| commit | 7a42d1c1ca460c32b8deaca5489eabea5dbcbe5e (patch) | |
| tree | 79e7ced81d7665316bf197c25b7a97d102b0c97f /filesystem/super_image.go | |
| parent | 5ef1a9ca49b520fb82a64f360820811edc79462e (diff) | |
Copy system_other.img to target_files.zip
Similar to https://r.android.com/3489814, this adds an additional rule
in systemOtherImage to create a hermetic version of system_other.img
with pinned timestamps. This information will be provided to
android_device via super_image.
block_list information is not implemented for system_other to match the
make behavior
Test: Built the soong built target_files.zip locally
Bug: 385383524
Change-Id: I4cbb4f8a5380203eaef846b3d8a56eb7791f8a34
Diffstat (limited to 'filesystem/super_image.go')
| -rw-r--r-- | filesystem/super_image.go | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/filesystem/super_image.go b/filesystem/super_image.go index da007bbb5..58c938aee 100644 --- a/filesystem/super_image.go +++ b/filesystem/super_image.go @@ -291,8 +291,6 @@ func (s *superImage) buildMiscInfo(ctx android.ModuleContext) (android.Path, and switch p { case "system": handleSubPartition("system", s.partitionProps.System_partition) - // TODO: add system_other to deps after it can be generated - //getFsInfo("system_other", s.partitionProps.System_other_partition, &subImageInfo.System_other) case "system_dlkm": handleSubPartition("system_dlkm", s.partitionProps.System_dlkm_partition) case "system_ext": @@ -321,8 +319,7 @@ func (s *superImage) buildMiscInfo(ctx android.ModuleContext) (android.Path, and if len(systemOtherFiles) != 1 { ctx.PropertyErrorf("system_other_partition", "Expected 1 output file from module %q", *&s.properties.System_other_partition) } else { - addStr("system_other_image", systemOtherFiles[0].String()) - deps = append(deps, systemOtherFiles[0]) + handleSubPartition("system_other", s.partitionProps.System_other_partition) } } |