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
diff --git a/filesystem/filesystem.go b/filesystem/filesystem.go
index f72cf17..ec6360a 100644
--- a/filesystem/filesystem.go
+++ b/filesystem/filesystem.go
@@ -153,7 +153,7 @@
 
 	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) 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)
 }
diff --git a/filesystem/filesystem_test.go b/filesystem/filesystem_test.go
index f284161..f325d96 100644
--- a/filesystem/filesystem_test.go
+++ b/filesystem/filesystem_test.go
@@ -161,7 +161,7 @@
 				"libfoo",
 				"libbar",
 			],
-			linkerconfig: {
+			linker_config: {
 				gen_linker_config: true,
 				linker_config_srcs: ["linker.config.json"],
 			},
@@ -227,7 +227,7 @@
 					deps: ["foo"],
 				},
 			},
-			linkerconfig: {
+			linker_config: {
 				gen_linker_config: true,
 				linker_config_srcs: ["linker.config.json"],
 			},
@@ -325,7 +325,7 @@
 			deps: [
 				"libfoo",
 			],
-			linkerconfig: {
+			linker_config: {
 				gen_linker_config: true,
 				linker_config_srcs: ["linker.config.json"],
 			},
@@ -709,7 +709,7 @@
 android_filesystem {
     name: "myfilesystem",
     deps: ["libfoo_has_no_stubs", "libfoo_has_stubs"],
-    linkerconfig: {
+    linker_config: {
         gen_linker_config: true,
         linker_config_srcs: ["linker.config.json"],
     },
diff --git a/filesystem/system_image.go b/filesystem/system_image.go
index 0d54ff5..672458c 100644
--- a/filesystem/system_image.go
+++ b/filesystem/system_image.go
@@ -42,13 +42,13 @@
 }
 
 func (s *systemImage) BuildLinkerConfigFile(ctx android.ModuleContext, builder *android.RuleBuilder, rebasedDir android.OutputPath) {
-	if !proptools.Bool(s.filesystem.properties.Linkerconfig.Gen_linker_config) {
+	if !proptools.Bool(s.filesystem.properties.Linker_config.Gen_linker_config) {
 		return
 	}
 
 	provideModules, requireModules := s.getLibsForLinkerConfig(ctx)
 	output := rebasedDir.Join(ctx, "etc", "linker.config.pb")
-	linkerconfig.BuildLinkerConfig(ctx, builder, android.PathsForModuleSrc(ctx, s.filesystem.properties.Linkerconfig.Linker_config_srcs), provideModules, requireModules, output)
+	linkerconfig.BuildLinkerConfig(ctx, builder, android.PathsForModuleSrc(ctx, s.filesystem.properties.Linker_config.Linker_config_srcs), provideModules, requireModules, output)
 
 	s.appendToEntry(ctx, output)
 }