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

Merge \\"Fix static+shared with generated sources\\" am: c951ef1164

Browse Source 
am: 5980699b62

Change-Id: Ibfc83de83d258ed9eec0529087fa741c013ef30b
This commit is contained in:
Colin Cross
2016-07-28 00:48:45 +00:00
committed by android-build-merger
parent 7d7904a1a0 5980699b62
commit a6b6f8c185
1 changed files with 1 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
cc/cc.go
View File

@@ -2691,6 +2691,7 @@ func linkageMutator(mctx android.BottomUpMutatorContext) {
// Optimize out compiling common .o files twice for static+shared libraries // Optimize out compiling common .o files twice for static+shared libraries
mctx.AddInterVariantDependency(reuseObjTag, shared, static) mctx.AddInterVariantDependency(reuseObjTag, shared, static)
sharedCompiler.baseCompiler.Properties.Srcs = nil sharedCompiler.baseCompiler.Properties.Srcs = nil
sharedCompiler.baseCompiler.Properties.Generated_sources = nil
} }
} }
} else if linker.buildStatic() { } else if linker.buildStatic() {