diff options
Diffstat (limited to 'rust/binary.go')
| -rw-r--r-- | rust/binary.go | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/rust/binary.go b/rust/binary.go index cba29a023..5a03d91c2 100644 --- a/rust/binary.go +++ b/rust/binary.go @@ -139,7 +139,10 @@ func (binary *binaryDecorator) compile(ctx ModuleContext, flags Flags, deps Path flags.RustFlags = append(flags.RustFlags, deps.depFlags...) flags.LinkFlags = append(flags.LinkFlags, deps.depLinkFlags...) - flags.LinkFlags = append(flags.LinkFlags, deps.linkObjects...) + flags.LinkFlags = append(flags.LinkFlags, deps.rustLibObjects...) + flags.LinkFlags = append(flags.LinkFlags, deps.sharedLibObjects...) + flags.LinkFlags = append(flags.LinkFlags, deps.staticLibObjects...) + flags.LinkFlags = append(flags.LinkFlags, deps.wholeStaticLibObjects...) if binary.stripper.NeedsStrip(ctx) { strippedOutputFile := outputFile @@ -165,11 +168,11 @@ func (binary *binaryDecorator) autoDep(ctx android.BottomUpMutatorContext) autoD } } -func (binary *binaryDecorator) stdLinkage(ctx *depsContext) RustLinkage { +func (binary *binaryDecorator) stdLinkage(device bool) RustLinkage { if binary.preferRlib() { return RlibLinkage } - return binary.baseCompiler.stdLinkage(ctx) + return binary.baseCompiler.stdLinkage(device) } func (binary *binaryDecorator) binary() bool { @@ -183,3 +186,8 @@ func (binary *binaryDecorator) staticallyLinked() bool { func (binary *binaryDecorator) testBinary() bool { return false } + +func (binary *binaryDecorator) moduleInfoJSON(ctx ModuleContext, moduleInfoJSON *android.ModuleInfoJSON) { + binary.baseCompiler.moduleInfoJSON(ctx, moduleInfoJSON) + moduleInfoJSON.Class = []string{"EXECUTABLES"} +} |