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

Pass DepsContext to dependency methods

Browse Source 
Pass a DepsContext that embeds android.BottomUpMutatorContext
instead of android.BaseContext so that dependency methods can
directly add dependencies.

Test: m -j
Change-Id: Id4c157975d3d6f03efd99785d217bef486a76139
This commit is contained in:
Colin Cross
2016-12-13 17:06:13 -08:00
parent 5950f3827c
commit 37047f1c7e
10 changed files with 28 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
cc/test.go
View File

@@ -199,7 +199,7 @@ func (test *testBinary) linkerInit(ctx BaseModuleContext) {
test.binaryDecorator.linkerInit(ctx)
}
func (test *testBinary) linkerDeps(ctx BaseModuleContext, deps Deps) Deps {
func (test *testBinary) linkerDeps(ctx DepsContext, deps Deps) Deps {
deps = test.testDecorator.linkerDeps(ctx, deps)
deps = test.binaryDecorator.linkerDeps(ctx, deps)
return deps
@@ -250,7 +250,7 @@ func (test *testLibrary) linkerInit(ctx BaseModuleContext) {
test.libraryDecorator.linkerInit(ctx)
}
func (test *testLibrary) linkerDeps(ctx BaseModuleContext, deps Deps) Deps {
func (test *testLibrary) linkerDeps(ctx DepsContext, deps Deps) Deps {
deps = test.testDecorator.linkerDeps(ctx, deps)
deps = test.libraryDecorator.linkerDeps(ctx, deps)
return deps
@@ -288,7 +288,7 @@ func (benchmark *benchmarkDecorator) linkerInit(ctx BaseModuleContext) {
benchmark.binaryDecorator.linkerInit(ctx)
}
func (benchmark *benchmarkDecorator) linkerDeps(ctx BaseModuleContext, deps Deps) Deps {
func (benchmark *benchmarkDecorator) linkerDeps(ctx DepsContext, deps Deps) Deps {
deps = benchmark.binaryDecorator.linkerDeps(ctx, deps)
deps.StaticLibs = append(deps.StaticLibs, "libgoogle-benchmark")
return deps