extensions/extensions_resources.gyp - Issue 672403002: Cleanup: Remove most enable_extensions logic in extensions code.

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

Issue 672403002: Cleanup: Remove most enable_extensions logic in extensions code. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: fix android Created 6 years, 2 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:

View side-by-side diff with in-line comments

Download patch

Index: extensions/extensions_resources.gyp

diff --git a/extensions/extensions_resources.gyp b/extensions/extensions_resources.gyp

index 53c44dc75c0b9fcda30d17ff623ea3b527dd4726..ed81dee7d2db92c5da7a10bf7fe28ac10acecc5f 100644

--- a/extensions/extensions_resources.gyp

+++ b/extensions/extensions_resources.gyp

@@ -10,6 +10,9 @@

'variables': {

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

+ 'dependencies': [

+ '../device/serial/serial.gyp:device_serial_mojo',

+ ],

'actions': [

{

'action_name': 'generate_extensions_resources',

@@ -37,13 +40,6 @@

'includes': [ '../build/grit_target.gypi' ],

- 'conditions': [

- ['enable_extensions==1', {

- 'dependencies': [

- '../device/serial/serial.gyp:device_serial_mojo',

- ],

- }],

- ],

}

]

}

« no previous file with comments | « extensions/extensions.gyp ('k') | extensions/renderer/BUILD.gn » ('j') | no next file with comments »