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

Support filegroups for version_script and related properties

Browse Source 
Bug: 71715793
Test: m checkbuild
Change-Id: Ibf78a5ec88e743f29504c91057d2cfced667c8b4
This commit is contained in:
Colin Cross
2018-02-06 14:40:13 -08:00
parent fa54e751d9
commit 2383f3b693
3 changed files with 27 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
cc/binary.go
View File

@@ -158,6 +158,9 @@ func (binary *binaryDecorator) linkerDeps(ctx DepsContext, deps Deps) Deps {
ctx.ModuleErrorf("statically linking libc to dynamic executable, please remove libc\n" +
"from static libs or set static_executable: true")
}
android.ExtractSourceDeps(ctx, binary.Properties.Version_script)
return deps
}
@@ -277,7 +280,7 @@ func (binary *binaryDecorator) linkerFlags(ctx ModuleContext, flags Flags) Flags
func (binary *binaryDecorator) link(ctx ModuleContext,
flags Flags, deps PathDeps, objs Objects) android.Path {
versionScript := android.OptionalPathForModuleSrc(ctx, binary.Properties.Version_script)
versionScript := ctx.ExpandOptionalSource(binary.Properties.Version_script, "version_script")
fileName := binary.getStem(ctx) + flags.Toolchain.ExecutableSuffix()
outputFile := android.PathForModuleOut(ctx, fileName)
ret := outputFile