Return false in DirectlyInAnyApex for host libraries.
Host doesn't have apexes.
Bug: 122947954
Test: build dex2oat, check that libnativebridge is installed.
Change-Id: I3548e3f155a200e56d71e88631b71511bad84161
diff --git a/cc/cc.go b/cc/cc.go
index 4717b72..46ce841 100644
--- a/cc/cc.go
+++ b/cc/cc.go
@@ -874,7 +874,8 @@
// force anything in the make world to link against the stubs library.
// (unless it is explicitly referenced via .bootstrap suffix or the
// module is marked with 'bootstrap: true').
- if c.HasStubsVariants() && android.DirectlyInAnyApex(ctx.baseModuleName()) &&
+ if c.HasStubsVariants() &&
+ android.DirectlyInAnyApex(ctx, ctx.baseModuleName()) &&
!c.inRecovery() && !c.useVndk() && !c.static() && c.IsStubs() {
c.Properties.HideFromMake = false // unhide
// Note: this is still non-installable
@@ -1456,7 +1457,7 @@
depIsStubs := dependentLibrary.buildStubs()
depHasStubs := ccDep.HasStubsVariants()
depInSameApex := android.DirectlyInApex(c.ApexName(), depName)
- depInPlatform := !android.DirectlyInAnyApex(depName)
+ depInPlatform := !android.DirectlyInAnyApex(ctx, depName)
var useThisDep bool
if depIsStubs && explicitlyVersioned {