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

Merge "XOM dependency check skipping static binaries." am: 2ccd9b83d0

Browse Source 
am: 054d752f4a

Change-Id: I1d553df12891c101fd5265083b9482ab685f3645
This commit is contained in:
Ivan Lozano
2019-01-31 13:57:03 -08:00
committed by android-build-merger
parent 19e2a83d48 054d752f4a
commit 33c1d15591
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cc/xom.go
View File

@@ -50,7 +50,7 @@ func (xom *xom) flags(ctx ModuleContext, flags Flags) Flags {
// If any static dependencies have XOM disabled, we should disable XOM in this module, // If any static dependencies have XOM disabled, we should disable XOM in this module,
// the assumption being if it's been explicitly disabled then there's probably incompatible // the assumption being if it's been explicitly disabled then there's probably incompatible
// code in the library which may get pulled in. // code in the library which may get pulled in.
if !ctx.static() && !disableXom { if !disableXom {
ctx.VisitDirectDeps(func(m android.Module) { ctx.VisitDirectDeps(func(m android.Module) {
cc, ok := m.(*Module) cc, ok := m.(*Module)
if !ok || cc.xom == nil || !cc.static() { if !ok || cc.xom == nil || !cc.static() {