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

Side by Side Diff: tools/gn/header_checker.cc

Issue 1479313002: GN: Use all targets to determine whether a file is generated (for `check`). (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: be more explicit, per brettw Created 5 years 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 unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "tools/gn/header_checker.h" 5 #include "tools/gn/header_checker.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/files/file_util.h" 10 #include "base/files/file_util.h"
(...skipping 145 matching lines...) Expand 10 before | Expand all | Expand 10 after
156 156
157 scoped_refptr<base::SequencedWorkerPool> pool( 157 scoped_refptr<base::SequencedWorkerPool> pool(
158 new base::SequencedWorkerPool(16, "HeaderChecker")); 158 new base::SequencedWorkerPool(16, "HeaderChecker"));
159 for (const auto& file : files) { 159 for (const auto& file : files) {
160 // Only check C-like source files (RC files also have includes). 160 // Only check C-like source files (RC files also have includes).
161 SourceFileType type = GetSourceFileType(file.first); 161 SourceFileType type = GetSourceFileType(file.first);
162 if (type != SOURCE_CPP && type != SOURCE_H && type != SOURCE_C && 162 if (type != SOURCE_CPP && type != SOURCE_H && type != SOURCE_C &&
163 type != SOURCE_M && type != SOURCE_MM && type != SOURCE_RC) 163 type != SOURCE_M && type != SOURCE_MM && type != SOURCE_RC)
164 continue; 164 continue;
165 165
166 // If any target marks it as generated, don't check it. 166 // If any target marks it as generated, don't check it. We have to check
167 // file_map_, which includes all known files; files only includes those
168 // being checked.
167 bool is_generated = false; 169 bool is_generated = false;
168 for (const auto& vect_i : file.second) 170 for (const auto& vect_i : file_map_[file.first])
169 is_generated |= vect_i.is_generated; 171 is_generated |= vect_i.is_generated;
170 if (is_generated) 172 if (is_generated)
171 continue; 173 continue;
172 174
173 for (const auto& vect_i : file.second) { 175 for (const auto& vect_i : file.second) {
174 if (vect_i.target->check_includes()) { 176 if (vect_i.target->check_includes()) {
175 pool->PostWorkerTaskWithShutdownBehavior( 177 pool->PostWorkerTaskWithShutdownBehavior(
176 FROM_HERE, 178 FROM_HERE,
177 base::Bind(&HeaderChecker::DoWork, this, vect_i.target, file.first), 179 base::Bind(&HeaderChecker::DoWork, this, vect_i.target, file.first),
178 base::SequencedWorkerPool::BLOCK_SHUTDOWN); 180 base::SequencedWorkerPool::BLOCK_SHUTDOWN);
(...skipping 396 matching lines...) Expand 10 before | Expand all | Expand 10 after
575 if (targets_with_other_toolchains.size() + 577 if (targets_with_other_toolchains.size() +
576 targets_with_matching_toolchains.size() > 1) 578 targets_with_matching_toolchains.size() > 1)
577 msg += "at least one of "; 579 msg += "at least one of ";
578 msg += "which should somehow be reachable."; 580 msg += "which should somehow be reachable.";
579 581
580 // Danger: must call CreatePersistentRange to put in Err. 582 // Danger: must call CreatePersistentRange to put in Err.
581 return Err(CreatePersistentRange(source_file, range), 583 return Err(CreatePersistentRange(source_file, range),
582 "Include not allowed.", msg); 584 "Include not allowed.", msg);
583 } 585 }
584 586
OLDNEW
« 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