diff options
| author | 2025-01-10 13:00:03 -0800 | |
|---|---|---|
| committer | 2025-01-10 13:00:03 -0800 | |
| commit | 04295513fb16175cee06a311351566bb60fc6a75 (patch) | |
| tree | b36c74f9623e5a58679e744d8a1423349d73eee2 /filesystem/android_device.go | |
| parent | 45de73a60c09c763b0fd88b85d744ea872588dfa (diff) | |
| parent | d8ce324e6a98c20dd24ee9a1b7818c36d8abebc0 (diff) | |
Merge changes Ia60fadb8,I13310d60 into main
* changes:
Add a partial IMAGES/ subdir for target_files.zip
Add a Stem property to filesystem
Diffstat (limited to 'filesystem/android_device.go')
| -rw-r--r-- | filesystem/android_device.go | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/filesystem/android_device.go b/filesystem/android_device.go index 83d56c638..555eddc03 100644 --- a/filesystem/android_device.go +++ b/filesystem/android_device.go @@ -208,6 +208,9 @@ func (a *androidDevice) buildTargetFilesZip(ctx android.ModuleContext) { toCopy = append(toCopy, targetFilesZipCopy{a.partitionProps.Recovery_partition_name, "VENDOR_BOOT/RAMDISK"}) } + // Create an IMAGES/ subdirectory + builder.Command().Textf("mkdir -p %s/IMAGES/", targetFilesDir.String()) + for _, zipCopy := range toCopy { if zipCopy.srcModule == nil { continue @@ -228,6 +231,7 @@ func (a *androidDevice) buildTargetFilesZip(ctx android.ModuleContext) { // Create the ROOT partition in target_files.zip builder.Command().Textf("rsync --links --exclude=system/* %s/ -r %s/ROOT", fsInfo.RootDir, targetFilesDir.String()) } + builder.Command().Textf("cp %s %s/IMAGES/", fsInfo.Output, targetFilesDir.String()) } // Copy cmdline, kernel etc. files of boot images if a.partitionProps.Vendor_boot_partition_name != nil { |