content/content_renderer.gypi - Issue 11414180: Add a gyp flag to allow removing dependency on ppapi.

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/content_renderer.gypi

Issue 11414180: Add a gyp flag to allow removing dependency on ppapi. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Addressed Jay's comments and rebase Created 8 years, 1 month 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

« content/browser/renderer_host/render_message_filter.cc ('K') | « content/content_ppapi_plugin.gypi ('k') | content/content_tests.gypi » ('j') | content/renderer/pepper/pepper_plugin_delegate_impl.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/content_renderer.gypi

diff --git a/content/content_renderer.gypi b/content/content_renderer.gypi

index 81d31ba16f79dcc77eae676cb130939336c82ba0..3ecd7c9c1f12bc33ee7b7c1a7e55818e5fa6428d 100644

--- a/content/content_renderer.gypi

+++ b/content/content_renderer.gypi

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

'dependencies': [

'../jingle/jingle.gyp:jingle_glue',

'../net/net.gyp:net',

- '../ppapi/ppapi_internal.gyp:ppapi_host',

- '../ppapi/ppapi_internal.gyp:ppapi_proxy',

- '../ppapi/ppapi_internal.gyp:ppapi_shared',

'../skia/skia.gyp:skia',

'../third_party/hyphen/hyphen.gyp:hyphen',

'../third_party/icu/icu.gyp:icuuc',

@@ -210,6 +207,8 @@

'renderer/pepper/renderer_ppapi_host_impl.h',

'renderer/plugin_channel_host.cc',

'renderer/plugin_channel_host.h',

+ 'renderer/plugin_delegate_helper.cc',

+ 'renderer/plugin_delegate_helper.h',

'renderer/browser_plugin/browser_plugin.cc',

'renderer/browser_plugin/browser_plugin.h',

'renderer/browser_plugin/browser_plugin_backing_store.h',

@@ -369,6 +368,17 @@

'renderer/p2p/socket_dispatcher.h',

}],

+ ['enable_ppapi==1', {

+ 'dependencies': [

+ '../ppapi/ppapi_internal.gyp:ppapi_host',

+ '../ppapi/ppapi_internal.gyp:ppapi_proxy',

+ '../ppapi/ppapi_internal.gyp:ppapi_shared',

+ ],

+ }, { # enable_ppapi==0

+ 'sources/': [

+ ['exclude', '^renderer/pepper/'],

+ ],

+ }],

['java_bridge==1', {

'defines': [

'ENABLE_JAVA_BRIDGE',