mixed builds correctly reference stubs libs
Bug: 270408757 Test: go test Test: m NeuralNetworksTest_shared_partial --bazel-mode-staging && verify that Ninja commands link libneuralnetworks via stubs Change-Id: I19bf5a829cea7fd00c0f82511ad2bddbc40fae4f
This commit is contained in:
19
cc/cc.go
19
cc/cc.go
@@ -1960,6 +1960,17 @@ func (c *Module) ProcessBazelQueryResponse(ctx android.ModuleContext) {
|
||||
c.maybeInstall(mctx, apexInfo)
|
||||
}
|
||||
|
||||
func moduleContextFromAndroidModuleContext(actx android.ModuleContext, c *Module) ModuleContext {
|
||||
ctx := &moduleContext{
|
||||
ModuleContext: actx,
|
||||
moduleContextImpl: moduleContextImpl{
|
||||
mod: c,
|
||||
},
|
||||
}
|
||||
ctx.ctx = ctx
|
||||
return ctx
|
||||
}
|
||||
|
||||
func (c *Module) GenerateAndroidBuildActions(actx android.ModuleContext) {
|
||||
// Handle the case of a test module split by `test_per_src` mutator.
|
||||
//
|
||||
@@ -1979,13 +1990,7 @@ func (c *Module) GenerateAndroidBuildActions(actx android.ModuleContext) {
|
||||
|
||||
c.makeLinkType = GetMakeLinkType(actx, c)
|
||||
|
||||
ctx := &moduleContext{
|
||||
ModuleContext: actx,
|
||||
moduleContextImpl: moduleContextImpl{
|
||||
mod: c,
|
||||
},
|
||||
}
|
||||
ctx.ctx = ctx
|
||||
ctx := moduleContextFromAndroidModuleContext(actx, c)
|
||||
|
||||
deps := c.depsToPaths(ctx)
|
||||
if ctx.Failed() {
|
||||
|
Reference in New Issue
Block a user