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

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

Issue 2561963002: base: Remove the string logging from CHECK(). (Closed)
Patch Set: checkstring: rebase Created 4 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
OLDNEW
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 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/ninja_binary_target_writer.h" 5 #include "tools/gn/ninja_binary_target_writer.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 #include <string.h> 8 #include <string.h>
9 9
10 #include <cstring> 10 #include <cstring>
(...skipping 386 matching lines...) Expand 10 before | Expand all | Expand 10 after
397 } 397 }
398 if (used_types.Get(SOURCE_MM)) { 398 if (used_types.Get(SOURCE_MM)) {
399 WriteOneFlag(SUBSTITUTION_CFLAGS_OBJCC, has_precompiled_headers, 399 WriteOneFlag(SUBSTITUTION_CFLAGS_OBJCC, has_precompiled_headers,
400 Toolchain::TYPE_OBJCXX, &ConfigValues::cflags_objcc, opts); 400 Toolchain::TYPE_OBJCXX, &ConfigValues::cflags_objcc, opts);
401 } 401 }
402 402
403 WriteSharedVars(subst); 403 WriteSharedVars(subst);
404 } 404 }
405 405
406 OutputFile NinjaBinaryTargetWriter::WriteInputsStampAndGetDep() const { 406 OutputFile NinjaBinaryTargetWriter::WriteInputsStampAndGetDep() const {
407 CHECK(target_->toolchain()) 407 // Toolchain not set on target |target_->label().GetUserVisibleName(true)|.
408 << "Toolchain not set on target " 408 CHECK(target_->toolchain());
409 << target_->label().GetUserVisibleName(true);
410 409
411 if (target_->inputs().size() == 0) 410 if (target_->inputs().size() == 0)
412 return OutputFile(); // No inputs 411 return OutputFile(); // No inputs
413 412
414 // If we only have one input, return it directly instead of writing a stamp 413 // If we only have one input, return it directly instead of writing a stamp
415 // file for it. 414 // file for it.
416 if (target_->inputs().size() == 1) 415 if (target_->inputs().size() == 1)
417 return OutputFile(settings_->build_settings(), target_->inputs()[0]); 416 return OutputFile(settings_->build_settings(), target_->inputs()[0]);
418 417
419 // Make a stamp file. 418 // Make a stamp file.
(...skipping 648 matching lines...) Expand 10 before | Expand all | Expand 10 after
1068 "\n" 1067 "\n"
1069 "In the latter case, either rename one of the files or move one of\n" 1068 "In the latter case, either rename one of the files or move one of\n"
1070 "the sources to a separate source_set to avoid them both being in\n" 1069 "the sources to a separate source_set to avoid them both being in\n"
1071 "the same target."); 1070 "the same target.");
1072 g_scheduler->FailWithError(err); 1071 g_scheduler->FailWithError(err);
1073 return false; 1072 return false;
1074 } 1073 }
1075 } 1074 }
1076 return true; 1075 return true;
1077 } 1076 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698