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

Fix duplicate library dependencies am: 15a0d46283

Browse Source 
am: 852d16518c

Change-Id: Icf1ba7b42276affe6dbf2159422537e97bf711f8
This commit is contained in:
Colin Cross
2016-07-15 00:12:34 +00:00
committed by android-build-merger
parent 58da9d84c3 852d16518c
commit 232a2497e1
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
cc/cc.go
View File

@@ -878,8 +878,7 @@ func (c *Module) depsMutator(actx android.BottomUpMutatorContext) {
if inList(lib, deps.ReexportStaticLibHeaders) { if inList(lib, deps.ReexportStaticLibHeaders) {
depTag = staticExportDepTag depTag = staticExportDepTag
} }
actx.AddVariationDependencies([]blueprint.Variation{{"link", "static"}}, depTag, actx.AddVariationDependencies([]blueprint.Variation{{"link", "static"}}, depTag, lib)
deps.StaticLibs...)
} }
actx.AddVariationDependencies([]blueprint.Variation{{"link", "static"}}, lateStaticDepTag, actx.AddVariationDependencies([]blueprint.Variation{{"link", "static"}}, lateStaticDepTag,
@@ -890,8 +889,7 @@ func (c *Module) depsMutator(actx android.BottomUpMutatorContext) {
if inList(lib, deps.ReexportSharedLibHeaders) { if inList(lib, deps.ReexportSharedLibHeaders) {
depTag = sharedExportDepTag depTag = sharedExportDepTag
} }
actx.AddVariationDependencies([]blueprint.Variation{{"link", "shared"}}, depTag, actx.AddVariationDependencies([]blueprint.Variation{{"link", "shared"}}, depTag, lib)
deps.SharedLibs...)
} }
actx.AddVariationDependencies([]blueprint.Variation{{"link", "shared"}}, lateSharedDepTag, actx.AddVariationDependencies([]blueprint.Variation{{"link", "shared"}}, lateSharedDepTag,