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

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1440496

Change-Id: I47b9d4aab68ab95552faefffb20555ca5599689d
This commit is contained in:
Treehugger Robot
2020-09-29 15:34:34 +00:00
committed by Automerger Merge Worker

View File

@@ -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,