Merge "Fix static+shared with generated sources"
This commit is contained in:
commit
c951ef1164
1 changed files with 1 additions and 0 deletions
1
cc/cc.go
1
cc/cc.go
|
@ -2691,6 +2691,7 @@ func linkageMutator(mctx android.BottomUpMutatorContext) {
|
|||
// Optimize out compiling common .o files twice for static+shared libraries
|
||||
mctx.AddInterVariantDependency(reuseObjTag, shared, static)
|
||||
sharedCompiler.baseCompiler.Properties.Srcs = nil
|
||||
sharedCompiler.baseCompiler.Properties.Generated_sources = nil
|
||||
}
|
||||
}
|
||||
} else if linker.buildStatic() {
|
||||
|
|
Loading…
Reference in a new issue