third_party/leveldatabase/leveldatabase.gyp - Issue 142223002: Support -Goutput_dir=blahblah in GN-GYP hybrid mode

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: third_party/leveldatabase/leveldatabase.gyp

Issue 142223002: Support -Goutput_dir=blahblah in GN-GYP hybrid mode (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: prefer command line over env if both are specified Created 6 years, 11 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: third_party/leveldatabase/leveldatabase.gyp

diff --git a/third_party/leveldatabase/leveldatabase.gyp b/third_party/leveldatabase/leveldatabase.gyp

index f3510f63bd6c2c3e4df05940e7fc97dc723f1ea8..138e300464559caa4c25ab480f72aaa7478226bd 100644

--- a/third_party/leveldatabase/leveldatabase.gyp

+++ b/third_party/leveldatabase/leveldatabase.gyp

@@ -37,11 +37,11 @@

'target_name': 'leveldatabase',

'type': 'static_library',

'dependencies': [

+ '../../<(gyp_output_dir)/gn_gyp/third_party/re2/re2.gyp:re2',

'../../base/base.gyp:base',

# base::LazyInstance is a template that pulls in dynamic_annotations so

# we need to explictly link in the code for dynamic_annotations.

'../../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',

- '../../out/gn_gyp/third_party/re2/re2.gyp:re2',

'conditions': [

['use_snappy', {

« no previous file with comments | « gpu/gpu_config.gypi ('k') | third_party/libaddressinput/libaddressinput.gyp » ('j') | no next file with comments »