Merge "Don't include artifacts for host-cross targets" am: 6c76f18aae
am: ec2752052e
am: 33649cab1a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1440496 Change-Id: I1d3dfb7f678c8fad6078537cdc73f5b3e8066e16
This commit is contained in:
@@ -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,
|
||||
|
Reference in New Issue
Block a user