cc/cc.gyp - Issue 14823005: Remove inside_chromium_build gyp variable

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

Issue 14823005: Remove inside_chromium_build gyp variable (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: sort gyps, fix ios Created 7 years, 7 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: cc/cc.gyp

diff --git a/cc/cc.gyp b/cc/cc.gyp

index d536b16c5e9abb4e1b5d7390774c2eb322e84311..80216b76760c453330d828c3c1379bfcc06125a0 100644

--- a/cc/cc.gyp

+++ b/cc/cc.gyp

@@ -350,21 +350,7 @@

'trees/tree_synchronizer.cc',

'trees/tree_synchronizer.h',

- 'conditions': [

- ['inside_chromium_build==1', {

- 'webkit_src_dir': '<(DEPTH)/third_party/WebKit',

- }, {

- 'webkit_src_dir': '<(DEPTH)/../../..',

- }],

- ],

- 'conditions': [

- ['inside_chromium_build==0', {

- 'defines': [

- 'INSIDE_WEBKIT_BUILD=1',

- ],

- }],

- ],

'targets': [

{

'target_name': 'cc',

@@ -378,7 +364,7 @@

'<(DEPTH)/ui/gl/gl.gyp:gl',

'<(DEPTH)/ui/surface/surface.gyp:surface',

'<(DEPTH)/ui/ui.gyp:ui',

- '<(webkit_src_dir)/Source/WebKit/chromium/WebKit.gyp:webkit',

+ '<(DEPTH)/third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:webkit',

'defines': [

'CC_IMPLEMENTATION=1',

« no previous file with comments | « build/common.gypi ('k') | content/browser/devtools/devtools_resources.gyp » ('j') | no next file with comments »