Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(268)

Unified Diff: tools/gn/target.cc

Issue 2121793003: Stop recursion for create_bundle deps when crossing toolchain. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: tools/gn/target.cc
diff --git a/tools/gn/target.cc b/tools/gn/target.cc
index ddc8ad5074d0dd0351d1c094cd240a7ab28bc0ee..85955a7168fb371ffea80321bcf8c6c777d4e597 100644
--- a/tools/gn/target.cc
+++ b/tools/gn/target.cc
@@ -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);
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698