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

Unified Diff: tools/gn/command_gyp.cc

Issue 46683002: GN Mac build work (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 2 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
Index: tools/gn/command_gyp.cc
diff --git a/tools/gn/command_gyp.cc b/tools/gn/command_gyp.cc
index de089d393cfbf7a60ea49a678c56d318a035ae69..3c6bef9daf422f423137b3a845c08917e191098f 100644
--- a/tools/gn/command_gyp.cc
+++ b/tools/gn/command_gyp.cc
@@ -233,9 +233,6 @@ std::pair<int, int> WriteGypFiles(
for (CorrelatedTargetsMap::iterator i = correlated.begin();
i != correlated.end(); ++i) {
const TargetGroup& group = i->second;
- if (!EnsureTargetsMatch(group, err))
- return std::make_pair(0, 0);
-
if (!group.debug->item_node()->should_generate())
continue; // Skip non-generated ones.
if (group.debug->external())
@@ -243,6 +240,9 @@ std::pair<int, int> WriteGypFiles(
if (group.debug->gyp_file().is_null())
continue; // Skip ones without GYP files.
+ if (!EnsureTargetsMatch(group, err))
+ return std::make_pair(0, 0);
+
target_count++;
grouped_targets[helper.GetGypFileForTarget(group.debug, err)].push_back(
group);

Powered by Google App Engine
This is Rietveld 408576698