From 37240d9564c3e6e75ffc6bc2fb35bc800df841c3 Mon Sep 17 00:00:00 2001 From: Spandan Das Date: Fri, 14 Feb 2025 00:18:41 +0000 Subject: Package releasetools.py in target_files.zip This CL creates an intermediate filegroup, and adds that to `Releasetools_extension` dep of the autogenerated android_device. This dep will be used for packaging target_files.zip Bug: 3493530 Test: Built and diff'd target_files.zip Change-Id: I9a5a2c3dba5fd37924544e92cb2646837047600a --- fsgen/filesystem_creator.go | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) (limited to 'fsgen/filesystem_creator.go') diff --git a/fsgen/filesystem_creator.go b/fsgen/filesystem_creator.go index 6a9fc9236..c2721d29f 100644 --- a/fsgen/filesystem_creator.go +++ b/fsgen/filesystem_creator.go @@ -320,6 +320,26 @@ func (f *filesystemCreator) createBootloaderFilegroup(ctx android.LoadHookContex return bootloaderFilegroupName, true } +func (f *filesystemCreator) createReleaseToolsFilegroup(ctx android.LoadHookContext) (string, bool) { + releaseToolsDir := ctx.Config().ProductVariables().PartitionVarsForSoongMigrationOnlyDoNotUse.ReleaseToolsExtensionDir + if releaseToolsDir == "" { + return "", false + } + + releaseToolsFilegroupName := generatedModuleName(ctx.Config(), "releasetools") + filegroupProps := &struct { + Name *string + Srcs []string + Visibility []string + }{ + Name: proptools.StringPtr(releaseToolsFilegroupName), + Srcs: []string{"releasetools.py"}, + Visibility: []string{"//visibility:public"}, + } + ctx.CreateModuleInDirectory(android.FileGroupFactory, releaseToolsDir, filegroupProps) + return releaseToolsFilegroupName, true +} + func (f *filesystemCreator) createDeviceModule( ctx android.LoadHookContext, partitions allGeneratedPartitionData, @@ -387,9 +407,13 @@ func (f *filesystemCreator) createDeviceModule( Ab_ota_postinstall_config: ctx.Config().ProductVariables().PartitionVarsForSoongMigrationOnlyDoNotUse.AbOtaPostInstallConfig, Ramdisk_node_list: proptools.StringPtr(":ramdisk_node_list"), } + if bootloader, ok := f.createBootloaderFilegroup(ctx); ok { deviceProps.Bootloader = proptools.StringPtr(":" + bootloader) } + if releaseTools, ok := f.createReleaseToolsFilegroup(ctx); ok { + deviceProps.Releasetools_extension = proptools.StringPtr(":" + releaseTools) + } ctx.CreateModule(filesystem.AndroidDeviceFactory, baseProps, partitionProps, deviceProps) } -- cgit v1.2.3-59-g8ed1b