build/linux/system.gyp - Issue 206006: Force inclusion of build/common.gypi for all chromium gyp files.

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: build/linux/system.gyp

Issue 206006: Force inclusion of build/common.gypi for all chromium gyp files. (Closed)

Patch Set: 2nd round of feedback Created 11 years, 3 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: build/linux/system.gyp

diff --git a/build/linux/system.gyp b/build/linux/system.gyp

index 7b6d82cb10d6488e000e0317af8218e00ef4714e..9751a0ebcf6a6a26c9baa634f46037c0e127c04e 100644

--- a/build/linux/system.gyp

+++ b/build/linux/system.gyp

@@ -3,18 +3,18 @@

# found in the LICENSE file.

{

- 'variables' : {

- 'includes': [

- '../common.gypi',

- ],

- 'conditions': [

- ['sysroot!=""', {

+ 'conditions': [

+ ['sysroot!=""', {

+ 'variables': {

'pkg-config': './pkg-config-wrapper "<(sysroot)"',

- }, {

+ },

+ }, {

+ 'variables': {

'pkg-config': 'pkg-config'

- }],

- ],

- },

+ },

+ }],

+ ],

'targets': [

{

'target_name': 'gtk',