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

Add support for toc optimization in soong

Browse Source 
Skip relinking against shared libraries whose interface hasn't changed.

Test: mmma -j frameworks/native/libs/gui
Test: touch frameworks/native/libs/gui/BufferItem.cpp
Test: mmma -j frameworks/native/libs/gui, see nothing relinks past libgui
Bug: 26014946
Change-Id: I4d4b8da6a35c682341ae51869f5c72b51e192053
This commit is contained in:
Colin Cross
2016-09-30 17:10:16 -07:00
parent 12013c8fe6
commit 26c34ede29
6 changed files with 166 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
cc/library.go
View File

@@ -18,6 +18,7 @@ import (
"strings"
"github.com/google/blueprint"
"github.com/google/blueprint/pathtools"
"android/soong"
"android/soong/android"
@@ -158,6 +159,8 @@ type libraryDecorator struct {
// For reusing static library objects for shared library
reuseObjFiles android.Paths
// table-of-contents file to optimize out relinking when possible
tocFile android.OptionalPath
flagExporter
stripper
@@ -269,6 +272,7 @@ type libraryInterface interface {
static() bool
objs() android.Paths
reuseObjs() android.Paths
toc() android.OptionalPath
// Returns true if the build options for the module have selected a static or shared build
buildStatic() bool
@@ -434,10 +438,28 @@ func (library *libraryDecorator) linkShared(ctx ModuleContext,
}
}
linkerDeps = append(linkerDeps, deps.SharedLibsDeps...)
linkerDeps = append(linkerDeps, deps.LateSharedLibsDeps...)
TransformObjToDynamicBinary(ctx, objFiles, sharedLibs,
deps.StaticLibs, deps.LateStaticLibs, deps.WholeStaticLibs,
linkerDeps, deps.CrtBegin, deps.CrtEnd, false, builderFlags, outputFile)
if ctx.Device() {
// For device targets, optimize out relinking against shared
// libraries whose interface hasn't changed by depending on
// a table of contents file instead of the library itself.
// For host targets, the library might be part of a host tool
// that is run during the build, use the library directly so
// that the timestamp of the binary changes whenever a library
// changes and any necessary tools get re-run.
tocPath := outputFile.String()
tocPath = pathtools.ReplaceExtension(tocPath, flags.Toolchain.ShlibSuffix()[1:]+".toc")
tocFile := android.PathForOutput(ctx, tocPath)
library.tocFile = android.OptionalPathForPath(tocFile)
TransformSharedObjectToToc(ctx, outputFile, tocFile, builderFlags)
}
return ret
}
@@ -482,6 +504,10 @@ func (library *libraryDecorator) reuseObjs() android.Paths {
return library.reuseObjFiles
}
func (library *libraryDecorator) toc() android.OptionalPath {
return library.tocFile
}
func (library *libraryDecorator) install(ctx ModuleContext, file android.Path) {
if !ctx.static() {
library.baseInstaller.install(ctx, file)