chrome/chrome_renderer.gypi - Issue 673663004: Android: Do not build any extensions code except for extensions_constants.

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: chrome/chrome_renderer.gypi

Issue 673663004: Android: Do not build any extensions code except for extensions_constants. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@zoom_controller

Patch Set: fix merge conflict 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: chrome/chrome_renderer.gypi

diff --git a/chrome/chrome_renderer.gypi b/chrome/chrome_renderer.gypi

index dc89fcc63843497717e35c1a84babbf46256e59d..19aa32d82d7886b8e1ec7aeb8100ddaeda2dc43c 100644

--- a/chrome/chrome_renderer.gypi

+++ b/chrome/chrome_renderer.gypi

@@ -272,7 +272,6 @@

'../content/app/resources/content_resources.gyp:content_resources',

'../content/app/strings/content_strings.gyp:content_strings',

'../content/content.gyp:content_renderer',

- '../extensions/extensions_resources.gyp:extensions_resources',

'../media/cast/cast.gyp:cast_logging_proto',

'../media/cast/cast.gyp:cast_net',

'../media/cast/cast.gyp:cast_sender',

@@ -337,6 +336,7 @@

['enable_extensions==1', {

'dependencies': [

'../extensions/extensions.gyp:extensions_renderer',

+ '../extensions/extensions_resources.gyp:extensions_resources',

# TODO(hclam): See crbug.com/298380 for details.

# We should isolate the APIs needed by the renderer.

'<(DEPTH)/chrome/common/extensions/api/api.gyp:chrome_api',

« no previous file with comments | « chrome/chrome_common.gypi ('k') | chrome/chrome_repack_resources.gypi » ('j') | no next file with comments »