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

Unified Diff: tools/gn/gyp_binary_target_writer.cc

Issue 56433003: GN threading refactor (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 1 month 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 | « tools/gn/group_target_generator.cc ('k') | tools/gn/gyp_target_writer.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: tools/gn/gyp_binary_target_writer.cc
diff --git a/tools/gn/gyp_binary_target_writer.cc b/tools/gn/gyp_binary_target_writer.cc
index f668fd317ad58f08fca8cb03b9c027f61996c632..140ea15b8b973f1aa0353b8c9e5dd78201134cfc 100644
--- a/tools/gn/gyp_binary_target_writer.cc
+++ b/tools/gn/gyp_binary_target_writer.cc
@@ -7,6 +7,7 @@
#include <set>
#include "base/logging.h"
+#include "tools/gn/builder_record.h"
#include "tools/gn/config_values_extractors.h"
#include "tools/gn/err.h"
#include "tools/gn/escape.h"
@@ -118,7 +119,7 @@ GypBinaryTargetWriter::Flags::~Flags() {}
GypBinaryTargetWriter::GypBinaryTargetWriter(const TargetGroup& group,
std::ostream& out)
- : GypTargetWriter(group.debug, out),
+ : GypTargetWriter(group.debug->item()->AsTarget(), out),
group_(group) {
}
@@ -193,12 +194,12 @@ void GypBinaryTargetWriter::WriteVCConfiguration(int indent) {
Indent(indent) << "'configurations': {\n";
Indent(indent + kExtraIndent) << "'Debug': {\n";
- Flags debug_flags(FlagsFromTarget(group_.debug));
+ Flags debug_flags(FlagsFromTarget(group_.debug->item()->AsTarget()));
WriteVCFlags(debug_flags, indent + kExtraIndent * 2);
Indent(indent + kExtraIndent) << "},\n";
Indent(indent + kExtraIndent) << "'Release': {\n";
- Flags release_flags(FlagsFromTarget(group_.release));
+ Flags release_flags(FlagsFromTarget(group_.release->item()->AsTarget()));
WriteVCFlags(release_flags, indent + kExtraIndent * 2);
Indent(indent + kExtraIndent) << "},\n";
@@ -221,15 +222,18 @@ void GypBinaryTargetWriter::WriteLinuxConfiguration(int indent) {
Indent(indent + kExtraIndent) << "['_toolset == \"host\"', {\n";
Indent(indent + kExtraIndent * 2) << "'configurations': {\n";
Indent(indent + kExtraIndent * 3) << "'Debug': {\n";
- WriteLinuxFlagsForTarget(group_.host_debug, indent + kExtraIndent * 4);
+ WriteLinuxFlagsForTarget(group_.host_debug->item()->AsTarget(),
+ indent + kExtraIndent * 4);
Indent(indent + kExtraIndent * 3) << "},\n";
Indent(indent + kExtraIndent * 3) << "'Release': {\n";
- WriteLinuxFlagsForTarget(group_.host_release, indent + kExtraIndent * 4);
+ WriteLinuxFlagsForTarget(group_.host_release->item()->AsTarget(),
+ indent + kExtraIndent * 4);
Indent(indent + kExtraIndent * 3) << "},\n";
Indent(indent + kExtraIndent * 2) << "}\n";
// The sources are per-toolset but shared between debug & release.
- WriteSources(group_.host_debug, indent + kExtraIndent * 2);
+ WriteSources(group_.host_debug->item()->AsTarget(),
+ indent + kExtraIndent * 2);
Indent(indent + kExtraIndent) << "],\n";
}
@@ -238,10 +242,12 @@ void GypBinaryTargetWriter::WriteLinuxConfiguration(int indent) {
Indent(indent + kExtraIndent) << "['_toolset == \"target\"', {\n";
Indent(indent + kExtraIndent * 2) << "'configurations': {\n";
Indent(indent + kExtraIndent * 3) << "'Debug': {\n";
- WriteLinuxFlagsForTarget(group_.debug, indent + kExtraIndent * 4);
+ WriteLinuxFlagsForTarget(group_.debug->item()->AsTarget(),
+ indent + kExtraIndent * 4);
Indent(indent + kExtraIndent * 3) << "},\n";
Indent(indent + kExtraIndent * 3) << "'Release': {\n";
- WriteLinuxFlagsForTarget(group_.release, indent + kExtraIndent * 4);
+ WriteLinuxFlagsForTarget(group_.release->item()->AsTarget(),
+ indent + kExtraIndent * 4);
Indent(indent + kExtraIndent * 3) << "},\n";
Indent(indent + kExtraIndent * 2) << "},\n";
@@ -258,12 +264,12 @@ void GypBinaryTargetWriter::WriteMacConfiguration(int indent) {
Indent(indent) << "'configurations': {\n";
Indent(indent + kExtraIndent) << "'Debug': {\n";
- Flags debug_flags(FlagsFromTarget(group_.debug));
+ Flags debug_flags(FlagsFromTarget(group_.debug->item()->AsTarget()));
WriteMacFlags(debug_flags, indent + kExtraIndent * 2);
Indent(indent + kExtraIndent) << "},\n";
Indent(indent + kExtraIndent) << "'Release': {\n";
- Flags release_flags(FlagsFromTarget(group_.release));
+ Flags release_flags(FlagsFromTarget(group_.release->item()->AsTarget()));
WriteMacFlags(release_flags, indent + kExtraIndent * 2);
Indent(indent + kExtraIndent) << "},\n";
« no previous file with comments | « tools/gn/group_target_generator.cc ('k') | tools/gn/gyp_target_writer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698