From 2047a4c20600e3f4bb7715ff5711e7d9556bb584 Mon Sep 17 00:00:00 2001 From: Spandan Das Date: Mon, 11 Nov 2024 21:24:58 +0000 Subject: Remove linkerconfig prop to linker_config This makes this consistent with its inner props `gen_linker_config` and `linker_config_srcs` Test: m nothing --no-skip-soong-tests Change-Id: I6efee5cc2d182af9c600ec80e3b02d1776ba8eb9 --- filesystem/filesystem.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'filesystem/filesystem.go') diff --git a/filesystem/filesystem.go b/filesystem/filesystem.go index f72cf1715..ec6360a4b 100644 --- a/filesystem/filesystem.go +++ b/filesystem/filesystem.go @@ -153,7 +153,7 @@ type FilesystemProperties struct { F2fs F2fsProperties - Linkerconfig LinkerConfigProperties + Linker_config LinkerConfigProperties // Determines if the module is auto-generated from Soong or not. If the module is // auto-generated, its deps are exempted from visibility enforcement. @@ -721,13 +721,13 @@ func (f *filesystem) buildEventLogtagsFile(ctx android.ModuleContext, builder *a } func (f *filesystem) BuildLinkerConfigFile(ctx android.ModuleContext, builder *android.RuleBuilder, rebasedDir android.OutputPath) { - if !proptools.Bool(f.properties.Linkerconfig.Gen_linker_config) { + if !proptools.Bool(f.properties.Linker_config.Gen_linker_config) { return } provideModules, _ := f.getLibsForLinkerConfig(ctx) output := rebasedDir.Join(ctx, "etc", "linker.config.pb") - linkerconfig.BuildLinkerConfig(ctx, builder, android.PathsForModuleSrc(ctx, f.properties.Linkerconfig.Linker_config_srcs), provideModules, nil, output) + linkerconfig.BuildLinkerConfig(ctx, builder, android.PathsForModuleSrc(ctx, f.properties.Linker_config.Linker_config_srcs), provideModules, nil, output) f.appendToEntry(ctx, output) } -- cgit v1.2.3-59-g8ed1b