diff options
Diffstat (limited to 'filesystem/android_device.go')
| -rw-r--r-- | filesystem/android_device.go | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/filesystem/android_device.go b/filesystem/android_device.go index 960c96acf..c14cc4cff 100644 --- a/filesystem/android_device.go +++ b/filesystem/android_device.go @@ -398,8 +398,12 @@ func (a *androidDevice) copyImagesToTargetZip(ctx android.ModuleContext, builder superPartition := ctx.GetDirectDepProxyWithTag(*a.partitionProps.Super_partition_name, superPartitionDepTag) if info, ok := android.OtherModuleProvider(ctx, superPartition, SuperImageProvider); ok { for _, partition := range android.SortedKeys(info.SubImageInfo) { - builder.Command().Textf("cp ").Input(info.SubImageInfo[partition].OutputHermetic).Textf(" %s/IMAGES/", targetFilesDir.String()) - builder.Command().Textf("cp ").Input(info.SubImageInfo[partition].MapFile).Textf(" %s/IMAGES/", targetFilesDir.String()) + if info.SubImageInfo[partition].OutputHermetic != nil { + builder.Command().Textf("cp ").Input(info.SubImageInfo[partition].OutputHermetic).Textf(" %s/IMAGES/", targetFilesDir.String()) + } + if info.SubImageInfo[partition].MapFile != nil { + builder.Command().Textf("cp ").Input(info.SubImageInfo[partition].MapFile).Textf(" %s/IMAGES/", targetFilesDir.String()) + } } } else { ctx.ModuleErrorf("Super partition %s does set SuperImageProvider\n", superPartition.Name()) |