content/browser/devtools/devtools_resources.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: content/browser/devtools/devtools_resources.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: content/browser/devtools/devtools_resources.gyp

diff --git a/content/browser/devtools/devtools_resources.gyp b/content/browser/devtools/devtools_resources.gyp

index 39c09ae95ffc3c8a2bafdfb238e57cf95361a856..19b114c9dfadf3d4ee012acd5d6d00fcb950ff1e 100644

--- a/content/browser/devtools/devtools_resources.gyp

+++ b/content/browser/devtools/devtools_resources.gyp

@@ -3,21 +3,12 @@

# found in the LICENSE file.

{

- 'variables': {

- 'conditions': [

- ['inside_chromium_build==0', {

- 'webkit_src_dir': '../../../../../..',

- },{

- 'webkit_src_dir': '../../../third_party/WebKit',

- }],

- ],

- },

'targets': [

{

'target_name': 'devtools_resources',

'type': 'none',

'dependencies': [

- '<(webkit_src_dir)/Source/devtools/devtools.gyp:generate_devtools_grd',

+ '../../../third_party/WebKit/Source/devtools/devtools.gyp:generate_devtools_grd',

'variables': {

'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/webkit',

« no previous file with comments | « cc/cc.gyp ('k') | content/content.gyp » ('j') | no next file with comments »