commit c15fb6c0ae87fcd5246fa31d3f2903ea7cafb221
author Spandan Das <spandandas@google.com> Fri Jan 10 18:23:42 2025 +0000
committer Spandan Das <spandandas@google.com> Fri Jan 10 22:41:13 2025 +0000
tree 006c6269748a7f4661bcfb4da071dcd23a28afb1
parent 04295513fb16175cee06a311351566bb60fc6a75

Add bootloader to IMAGES/ subdir of soong built target_files.zip

This matches the make behavior.

Test: Built the target_files.zip locally
Bug: 388635097
Change-Id: Iac789a4c666682149e3ab78938695d7a521d4db5

filesystem/android_device.go

diff --git a/filesystem/android_device.go b/filesystem/android_device.go
index 555eddc..6a939e8 100644
--- a/filesystem/android_device.go
+++ b/filesystem/android_device.go
@@ -210,6 +210,9 @@
 
 	// Create an IMAGES/ subdirectory
 	builder.Command().Textf("mkdir -p %s/IMAGES/", targetFilesDir.String())
+	if a.deviceProps.Bootloader != nil {
+		builder.Command().Textf("cp ").Input(android.PathForModuleSrc(ctx, proptools.String(a.deviceProps.Bootloader))).Textf(" %s/IMAGES/bootloader", targetFilesDir.String())
+	}
 
 	for _, zipCopy := range toCopy {
 		if zipCopy.srcModule == nil {