commit ab65ba94812785d1772dbdef3b1fc1d469ca7d41
author Pete Bentley <prb@google.com> Fri Oct 18 12:39:56 2019 +0100
committer Pete Bentley <prb@google.com> Fri Oct 18 12:42:18 2019 +0100
tree cb139042f4cc295cb5649b378f9eed18b51d4aab
parent 43bfaf9f656da5195004ba5c37b04125d323770a

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

diff --git a/cc/object.go b/cc/object.go
index 1f1ac8e..31729a5 100644
--- a/cc/object.go
+++ b/cc/object.go
@@ -104,7 +104,7 @@
 	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) != "" {