From ab65ba94812785d1772dbdef3b1fc1d469ca7d41 Mon Sep 17 00:00:00 2001 From: Pete Bentley Date: Fri, 18 Oct 2019 12:39:56 +0100 Subject: [PATCH] Handle partial link of a single object with a linker script. Fixes: 142931094 Test: m bssl with -DNO_ASM and all assembly sources commented out Change-Id: Id56d325fbf1d4a0777944512a88f3c086e930af7 --- cc/object.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cc/object.go b/cc/object.go index 1f1ac8e1c..31729a5f8 100644 --- a/cc/object.go +++ b/cc/object.go @@ -104,7 +104,7 @@ func (object *objectLinker) link(ctx ModuleContext, var outputFile android.Path builderFlags := flagsToBuilderFlags(flags) - if len(objs.objFiles) == 1 { + if len(objs.objFiles) == 1 && String(object.Properties.Linker_script) == "" { outputFile = objs.objFiles[0] if String(object.Properties.Prefix_symbols) != "" {