Merge "Don't include artifacts for host-cross targets"

This commit is contained in:
Treehugger Robot 2020-09-29 14:03:05 +00:00 committed by Gerrit Code Review
commit 6c76f18aae
1 changed files with 6 additions and 0 deletions

View File

@ -1499,6 +1499,12 @@ func (a *apexBundle) DepsMutator(ctx android.BottomUpMutatorContext) {
} }
} }
for i, target := range targets { 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 // When multilib.* is omitted for native_shared_libs/jni_libs/tests, it implies
// multilib.both // multilib.both
addDependenciesForNativeModules(ctx, addDependenciesForNativeModules(ctx,