Don't use stubs for host apexs

Host apexs don't have a system-image associated with them so we need
to include all libraries, including those with stubs.

Test: ./art/test/testrunner/run_build_test_target.py -j50 art-linux-bionic-x64-zipapex
Bug: 125417922
Change-Id: Ie76e6a34e8be1057b29e2e005597c3e4b5fb1f9c

1 files changed, 4 insertions, 1 deletions

diff --git a/apex/apex.go b/apex/apex.go
index 86393377..8f89ca6e 100644
--- a/apex/apex.go
+++ b/apex/apex.go
@@ -733,11 +733,14 @@ func (a *apexBundle) GenerateAndroidBuildActions(ctx android.ModuleContext) {
 			// indirect dependencies
 			if am, ok := child.(android.ApexModule); ok && am.CanHaveApexVariants() && am.IsInstallableToApex() {
 				if cc, ok := child.(*cc.Module); ok {
-					if cc.IsStubs() || cc.HasStubsVariants() {
+					if !a.Host() && (cc.IsStubs() || cc.HasStubsVariants()) {
 						// If the dependency is a stubs lib, don't include it in this APEX,
 						// but make sure that the lib is installed on the device.
 						// In case no APEX is having the lib, the lib is installed to the system
 						// partition.
+						//
+						// Always include if we are a host-apex however since those won't have any
+						// system libraries.
 						if !android.DirectlyInAnyApex(ctx, cc.Name()) && !android.InList(cc.Name(), a.externalDeps) {
 							a.externalDeps = append(a.externalDeps, cc.Name())
 						}