Merge "Don't include artifacts for host-cross targets" am: 6c76f18aae

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1440496 Change-Id: I028eddd6d15397d5fb69abd1b38d03db6910b2b5
2020-09-29 14:29:13 +00:00
parent 4883f2e60c 6c76f18aae
commit ec2752052e
1 changed files with 6 additions and 0 deletions
--- a/apex/apex.go
+++ b/apex/apex.go
@@ -1499,6 +1499,12 @@ func (a *apexBundle) DepsMutator(ctx android.BottomUpMutatorContext) {
 		}
 	}
 	for i, target := range targets {
+		if target.HostCross {
+			// Don't include artifats for the host cross targets because there is no way
+			// for us to run those artifacts natively on host
+			continue
+		}
+
 		// When multilib.* is omitted for native_shared_libs/jni_libs/tests, it implies
 		// multilib.both
 		addDependenciesForNativeModules(ctx,