Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e8d3e1c7 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Remove linkerconfig prop to linker_config" into main

parents ecde72f2 2047a4c2

apex/apex_test.go

+1 −1
Original line number Diff line number Diff line
@@ -10187,7 +10187,7 @@ func TestFileSystemShouldSkipApexLibraries(t *testing.T) { 
			deps: [

				"libfoo",

			],

			linkerconfig: {

			linker_config: {

				gen_linker_config: true,

				linker_config_srcs: ["linker.config.json"],

			},

filesystem/filesystem.go

+3 −3
Original line number Diff line number Diff line
@@ -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.
@@ -726,13 +726,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)

}

filesystem/filesystem_test.go

+4 −4
Original line number Diff line number Diff line
@@ -161,7 +161,7 @@ func TestFileSystemFillsLinkerConfigWithStubLibs(t *testing.T) { 
				"libfoo",

				"libbar",

			],

			linkerconfig: {

			linker_config: {

				gen_linker_config: true,

				linker_config_srcs: ["linker.config.json"],

			},
@@ -227,7 +227,7 @@ func TestFileSystemGathersItemsOnlyInSystemPartition(t *testing.T) { 
					deps: ["foo"],

				},

			},

			linkerconfig: {

			linker_config: {

				gen_linker_config: true,

				linker_config_srcs: ["linker.config.json"],

			},
@@ -325,7 +325,7 @@ func TestFileSystemWithCoverageVariants(t *testing.T) { 
			deps: [

				"libfoo",

			],

			linkerconfig: {

			linker_config: {

				gen_linker_config: true,

				linker_config_srcs: ["linker.config.json"],

			},
@@ -709,7 +709,7 @@ func TestInstallLinkerConfigFile(t *testing.T) { 
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"],

    },

filesystem/system_image.go

+2 −2
Original line number Diff line number Diff line
@@ -42,13 +42,13 @@ func (s systemImage) FsProps() FilesystemProperties { 
}



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)

}

fsgen/filesystem_creator.go

+2 −2
Original line number Diff line number Diff line
@@ -230,8 +230,8 @@ func (f *filesystemCreator) createPartition(ctx android.LoadHookContext, partiti 
	}



	if partitionType == "vendor" || partitionType == "product" {

		fsProps.Linkerconfig.Gen_linker_config = proptools.BoolPtr(true)

		fsProps.Linkerconfig.Linker_config_srcs = f.createLinkerConfigSourceFilegroups(ctx, partitionType)

		fsProps.Linker_config.Gen_linker_config = proptools.BoolPtr(true)

		fsProps.Linker_config.Linker_config_srcs = f.createLinkerConfigSourceFilegroups(ctx, partitionType)

	}



	if android.InList(partitionType, dlkmPartitions) {