tools/gn/ninja_helper.cc - Issue 22290010: Add support for data deps.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: tools/gn/ninja_helper.cc

Issue 22290010: Add support for data deps. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: remove switch Created 7 years, 4 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:

Index: tools/gn/ninja_helper.cc

diff --git a/tools/gn/ninja_helper.cc b/tools/gn/ninja_helper.cc

index c3d275bc51e73aa1bf831f9ce43d59548bc5e11a..e4f4082817a713a5e5f9ba4c0f9c9b8ab81674c9 100644

--- a/tools/gn/ninja_helper.cc

+++ b/tools/gn/ninja_helper.cc

@@ -116,12 +116,12 @@ OutputFile NinjaHelper::GetTargetOutputFile(const Target* target) const {

// This is prepended to the output file name.

const char* prefix;

- if (target->settings()->IsWin() ||

- target->output_type() == Target::EXECUTABLE) {

- prefix = "";

- } else {

+ if (!target->settings()->IsWin() &&

+ (target->output_type() == Target::SHARED_LIBRARY ||

+ target->output_type() == Target::STATIC_LIBRARY))

prefix = "lib";

- }

+ else

+ prefix = "";

const char* extension;

if (target->output_type() == Target::NONE ||

« no previous file with comments | « tools/gn/gn.gyp ('k') | tools/gn/ninja_target_writer.h » ('j') | no next file with comments »