diff options
| author | 2025-03-24 11:16:29 -0700 | |
|---|---|---|
| committer | 2025-03-24 11:16:29 -0700 | |
| commit | befeba4120e6c7af20566d89aabba53add0b294b (patch) | |
| tree | fe3e03f3309771ffa05e16fcc38a651591042123 /filesystem | |
| parent | 73326999541136999d52f6b9ecc7f3395cc3bb65 (diff) | |
| parent | 27452ec5b4e8a0e6e5e82c281b091033b7152dd8 (diff) | |
Merge "Dist Soong built target_files.zip in Soong only builds" into main
Diffstat (limited to 'filesystem')
| -rw-r--r-- | filesystem/android_device.go | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/filesystem/android_device.go b/filesystem/android_device.go index b96c5eae3..9a085a628 100644 --- a/filesystem/android_device.go +++ b/filesystem/android_device.go @@ -120,6 +120,7 @@ type androidDevice struct { rootDirForFsConfig string rootDirForFsConfigTimestamp android.Path apkCertsInfo android.Path + targetFilesZip android.Path } func AndroidDeviceFactory() android.Module { @@ -401,6 +402,9 @@ func (a *androidDevice) distFiles(ctx android.ModuleContext) { ctx.DistForGoalWithFilename("dist_files", a.miscInfo, "super_misc_info.txt") } } + if a.targetFilesZip != nil { + ctx.DistForGoalWithFilename("target-files-package", a.targetFilesZip, namePrefix+insertBeforeExtension(a.targetFilesZip.Base(), "-FILE_NAME_TAG_PLACEHOLDER")) + } } } @@ -590,6 +594,7 @@ func (a *androidDevice) buildTargetFilesZip(ctx android.ModuleContext, allInstal a.copyImagesToTargetZip(ctx, builder, targetFilesDir) a.copyMetadataToTargetZip(ctx, builder, targetFilesDir, allInstalledModules) + a.targetFilesZip = targetFilesZip builder.Command(). BuiltTool("soong_zip"). Text("-d"). |