Merge \"Fix static+shared with generated sources\"

am: c951ef1164 Change-Id: Ic8e896a5307348b16489cb5844aaa3b5c506e398
2016-07-28 00:46:21 +00:00
parent 1ec9eb2961 c951ef1164
commit 5980699b62
1 changed files with 1 additions and 0 deletions
--- a/cc/cc.go
+++ b/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() {