Merge "Delay error on version_script, etc. properties on Darwin" into main (301c01ae) · Commits · e / os / android_build_soong

cc/linker.go

+19 −12

Original line number	Diff line number	Diff line
		@@ -235,13 +235,16 @@ type BaseLinkerProperties struct {
		// Generate compact dynamic relocation table, default true.
		Pack_relocations *bool `android:"arch_variant"`

		// local file name to pass to the linker as --version-script
		// local file name to pass to the linker as --version-script. Not supported on darwin, and will fail to build
		// if provided to the darwin variant of a module.
		Version_script *string `android:"path,arch_variant"`

		// local file name to pass to the linker as --dynamic-list
		// local file name to pass to the linker as --dynamic-list. Not supported on darwin, and will fail to build
		// if provided to the darwin variant of a module.
		Dynamic_list *string `android:"path,arch_variant"`

		// local files to pass to the linker as --script
		// local files to pass to the linker as --script. Not supported on darwin or windows, and will fail to build
		// if provided to the darwin or windows variant of a module.
		Linker_scripts []string `android:"path,arch_variant"`

		// list of static libs that should not be used to build this module
		@@ -560,7 +563,7 @@ func (linker *baseLinker) linkerFlags(ctx ModuleContext, flags Flags) Flags {

		if versionScript.Valid() {
		if ctx.Darwin() {
		ctx.PropertyErrorf("version_script", "Not supported on Darwin")
		ctx.AddMissingDependencies([]string{"version_script_not_supported_on_darwin"})
		} else {
		flags.Local.LdFlags = append(flags.Local.LdFlags,
		config.VersionScriptFlagPrefix+versionScript.String())
		@@ -578,7 +581,7 @@ func (linker *baseLinker) linkerFlags(ctx ModuleContext, flags Flags) Flags {
		dynamicList := android.OptionalPathForModuleSrc(ctx, linker.Properties.Dynamic_list)
		if dynamicList.Valid() {
		if ctx.Darwin() {
		ctx.PropertyErrorf("dynamic_list", "Not supported on Darwin")
		ctx.AddMissingDependencies([]string{"dynamic_list_not_supported_on_darwin"})
		} else {
		flags.Local.LdFlags = append(flags.Local.LdFlags,
		"-Wl,--dynamic-list,"+dynamicList.String())
		@@ -587,7 +590,10 @@ func (linker *baseLinker) linkerFlags(ctx ModuleContext, flags Flags) Flags {
		}

		linkerScriptPaths := android.PathsForModuleSrc(ctx, linker.Properties.Linker_scripts)
		if len(linkerScriptPaths) > 0 && (ctx.Darwin() \|\| ctx.Windows()) {
		if len(linkerScriptPaths) > 0 {
		if ctx.Darwin() {
		ctx.AddMissingDependencies([]string{"linker_scripts_not_supported_on_darwin"})
		} else if ctx.Windows() {
		ctx.PropertyErrorf("linker_scripts", "Only supported for ELF files")
		} else {
		for _, linkerScriptPath := range linkerScriptPaths {
		@@ -597,6 +603,7 @@ func (linker *baseLinker) linkerFlags(ctx ModuleContext, flags Flags) Flags {
		}
		}
		}
		}

		return flags
		}