Index: tools/gn/command_gen.cc |
diff --git a/tools/gn/command_gen.cc b/tools/gn/command_gen.cc |
index 5be018aa4eee131d60004ef509b99030f2ca98e8..09af21e9dfae4043ba37bd3565b597e6097f1221 100644 |
--- a/tools/gn/command_gen.cc |
+++ b/tools/gn/command_gen.cc |
@@ -22,7 +22,19 @@ namespace { |
// Suppress output on success. |
const char kSwitchQuiet[] = "q"; |
-void BackgroundDoWrite(const Target* target, const Toolchain* toolchain) { |
+void BackgroundDoWrite(const Target* target, |
+ const Toolchain* toolchain, |
+ const std::vector<const Item*>& deps_for_visibility) { |
+ // Validate visibility. |
+ Err err; |
+ for (size_t i = 0; i < deps_for_visibility.size(); i++) { |
+ if (!Visibility::CheckItemVisibility(target, deps_for_visibility[i], |
+ &err)) { |
+ g_scheduler->FailWithError(err); |
+ break; // Don't return early since we need DecrementWorkCount below. |
scottmg
2014/04/01 06:18:35
Seems odd to RunAndWriteFile after an error?
|
+ } |
+ } |
+ |
NinjaTargetWriter::RunAndWriteFile(target, toolchain); |
g_scheduler->DecrementWorkCount(); |
} |
@@ -30,17 +42,27 @@ void BackgroundDoWrite(const Target* target, const Toolchain* toolchain) { |
// Called on the main thread. |
void ItemResolvedCallback(base::subtle::Atomic32* write_counter, |
scoped_refptr<Builder> builder, |
- const Item* item) { |
+ const BuilderRecord* record) { |
base::subtle::NoBarrier_AtomicIncrement(write_counter, 1); |
+ const Item* item = record->item(); |
const Target* target = item->AsTarget(); |
if (target) { |
const Toolchain* toolchain = |
builder->GetToolchain(target->settings()->toolchain_label()); |
DCHECK(toolchain); |
+ |
+ // Collect all dependencies. |
+ std::vector<const Item*> deps; |
+ for (BuilderRecord::BuilderRecordSet::const_iterator iter = |
+ record->all_deps().begin(); |
+ iter != record->all_deps().end(); |
+ ++iter) |
+ deps.push_back((*iter)->item()); |
+ |
g_scheduler->IncrementWorkCount(); |
g_scheduler->ScheduleWork( |
- base::Bind(&BackgroundDoWrite, target, toolchain)); |
+ base::Bind(&BackgroundDoWrite, target, toolchain, deps)); |
} |
} |