diff options
Diffstat (limited to 'filesystem/system_image.go')
| -rw-r--r-- | filesystem/system_image.go | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/filesystem/system_image.go b/filesystem/system_image.go index cc9093f9b..166b052f8 100644 --- a/filesystem/system_image.go +++ b/filesystem/system_image.go @@ -49,6 +49,7 @@ func (s *systemImage) BuildLinkerConfigFile( builder *android.RuleBuilder, rebasedDir android.OutputPath, fullInstallPaths *[]FullInstallPathInfo, + platformGeneratedFiles *[]string, ) { if !proptools.Bool(s.filesystem.properties.Linker_config.Gen_linker_config) { return @@ -61,10 +62,12 @@ func (s *systemImage) BuildLinkerConfigFile( linkerconfig.BuildLinkerConfig(ctx, android.PathsForModuleSrc(ctx, s.filesystem.properties.Linker_config.Linker_config_srcs), provideModules, requireModules, intermediateOutput) builder.Command().Text("cp").Input(intermediateOutput).Output(output) + installPath := android.PathForModuleInPartitionInstall(ctx, s.PartitionType(), "etc", "linker.config.pb") *fullInstallPaths = append(*fullInstallPaths, FullInstallPathInfo{ - FullInstallPath: android.PathForModuleInPartitionInstall(ctx, s.PartitionType(), "etc", "linker.config.pb"), + FullInstallPath: installPath, SourcePath: intermediateOutput, }) + *platformGeneratedFiles = append(*platformGeneratedFiles, installPath.String()) } else { // TODO: This branch is the logic that make uses for the linker config file, which is // different than linkerconfig.BuildLinkerConfig used above. Keeping both branches for now @@ -98,10 +101,12 @@ func (s *systemImage) BuildLinkerConfigFile( // TODO: Make also supports adding an extra append command with PRODUCT_EXTRA_STUB_LIBRARIES, // but that variable appears to have no usages. + installPath := android.PathForModuleInPartitionInstall(ctx, s.PartitionType(), "etc", "linker.config.pb") *fullInstallPaths = append(*fullInstallPaths, FullInstallPathInfo{ - FullInstallPath: android.PathForModuleInPartitionInstall(ctx, s.PartitionType(), "etc", "linker.config.pb"), + FullInstallPath: installPath, SourcePath: output, }) + *platformGeneratedFiles = append(*platformGeneratedFiles, installPath.String()) } s.appendToEntry(ctx, output) |