StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Handle partial link of a single object with a linker script. am: ab65ba9481 am: 89c1d5ff71

Browse Source 
am: 2f46a1c7fd

Change-Id: Ib6888f8246b38aeb564308a6e16902aedcbe509f
This commit is contained in:
Pete Bentley
2019-10-18 11:43:54 -07:00
committed by android-build-merger
parent 56ab9e509f 2f46a1c7fd
commit 4980868264
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cc/object.go
View File

@@ -104,7 +104,7 @@ func (object *objectLinker) link(ctx ModuleContext,
var outputFile android.Path var outputFile android.Path
builderFlags := flagsToBuilderFlags(flags) builderFlags := flagsToBuilderFlags(flags)
if len(objs.objFiles) == 1 { if len(objs.objFiles) == 1 && String(object.Properties.Linker_script) == "" {
outputFile = objs.objFiles[0] outputFile = objs.objFiles[0]
if String(object.Properties.Prefix_symbols) != "" { if String(object.Properties.Prefix_symbols) != "" {