Commit 511c073b authored by sdefresne's avatar sdefresne Committed by Commit bot

Stop recursion for create_bundle deps when crossing toolchain.

Only consider the bundle_data target that are defined in the same
toolchain as the create_bundle target in order to allow creation
of multi-arch build using different toolchain.

BUG=603180

Review-Url: https://codereview.chromium.org/2121793003
Cr-Commit-Position: refs/heads/master@{#403832}
parent 7a941f9d
......@@ -515,6 +515,10 @@ void Target::PullRecursiveBundleData() {
if (pair.ptr->output_type() == CREATE_BUNDLE)
continue;
// Don't propagate across toolchain.
if (pair.ptr->toolchain() != toolchain())
continue;
// Direct dependency on a bundle_data target.
if (pair.ptr->output_type() == BUNDLE_DATA)
bundle_data_.AddBundleData(pair.ptr);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment