Merge "Switch to toybox rm(1)."
diff --git a/cc/linker.go b/cc/linker.go
index 854dfc5..eb71268 100644
--- a/cc/linker.go
+++ b/cc/linker.go
@@ -150,6 +150,9 @@
// local file name to pass to the linker as --version_script
Version_script *string `android:"arch_variant"`
+
+ // Local file name to pass to the linker as --symbol-ordering-file
+ Symbol_ordering_file *string `android:"arch_variant"`
}
func NewBaseLinker(sanitize *sanitize) *baseLinker {
@@ -279,6 +282,8 @@
linker.Properties.Target.Vendor.Version_script)
}
+ android.ExtractSourceDeps(ctx, linker.Properties.Symbol_ordering_file)
+
return deps
}
@@ -435,6 +440,16 @@
}
}
+ if !linker.dynamicProperties.BuildStubs {
+ symbolOrderingFile := ctx.ExpandOptionalSource(
+ linker.Properties.Symbol_ordering_file, "Symbol_ordering_file")
+ if symbolOrderingFile.Valid() {
+ flags.LdFlags = append(flags.LdFlags,
+ "-Wl,--symbol-ordering-file,"+symbolOrderingFile.String())
+ flags.LdFlagsDeps = append(flags.LdFlagsDeps, symbolOrderingFile.Path())
+ }
+ }
+
return flags
}