Merge "Fix static+shared with generated sources"

This commit is contained in:
Colin Cross 2016-07-28 00:12:37 +00:00 committed by Gerrit Code Review
commit c951ef1164

View file

@ -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() {