summaryrefslogtreecommitdiff
path: root/fsgen
diff options
context:
space:
mode:
author Cole Faust <colefaust@google.com> 2025-02-24 13:23:21 -0800
committer Cole Faust <colefaust@google.com> 2025-02-24 13:23:21 -0800
commit2b2f1a028d974c2afbd707390e7f26221611e516 (patch)
tree3a66ac50dd2854652104e6dfd513b415121a039a /fsgen
parent324d19b8b5a20678586d4e8e4b894a2bba70a2ae (diff)
Use filesystem.DeviceProperties for Android_info
Makes it easier to follow the code by enabling "go to references" in the ide from the android_info definition. Test: Presubmits Change-Id: Iddf7d5629555e16e023617f2cf1973dde21fd737
Diffstat (limited to 'fsgen')
-rw-r--r--fsgen/filesystem_creator.go7
1 files changed, 3 insertions, 4 deletions
diff --git a/fsgen/filesystem_creator.go b/fsgen/filesystem_creator.go
index e2485a1d3..3d83706a3 100644
--- a/fsgen/filesystem_creator.go
+++ b/fsgen/filesystem_creator.go
@@ -347,11 +347,9 @@ func (f *filesystemCreator) createDeviceModule(
superImageSubPartitions []string,
) {
baseProps := &struct {
- Name *string
- Android_info *string
+ Name *string
}{
- Name: proptools.StringPtr(generatedModuleName(ctx.Config(), "device")),
- Android_info: proptools.StringPtr(":" + generatedModuleName(ctx.Config(), "android_info.prop{.txt}")),
+ Name: proptools.StringPtr(generatedModuleName(ctx.Config(), "device")),
}
// Currently, only the system and system_ext partition module is created.
@@ -406,6 +404,7 @@ func (f *filesystemCreator) createDeviceModule(
Ab_ota_partitions: ctx.Config().ProductVariables().PartitionVarsForSoongMigrationOnlyDoNotUse.AbOtaPartitions,
Ab_ota_postinstall_config: ctx.Config().ProductVariables().PartitionVarsForSoongMigrationOnlyDoNotUse.AbOtaPostInstallConfig,
Ramdisk_node_list: proptools.StringPtr(":ramdisk_node_list"),
+ Android_info: proptools.StringPtr(":" + generatedModuleName(ctx.Config(), "android_info.prop{.txt}")),
}
if bootloader, ok := f.createBootloaderFilegroup(ctx); ok {