Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(363)

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: ifdef PluginMain and WorkerMain Created 8 years 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: content/content_renderer.gypi
diff --git a/content/content_renderer.gypi b/content/content_renderer.gypi
index 81d31ba16f79dcc77eae676cb130939336c82ba0..8f3fb3aaae0b523cd4c0c6192fce9e55f97be48f 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',
@@ -234,6 +231,8 @@
'renderer/render_view_linux.cc',
'renderer/render_view_mouse_lock_dispatcher.cc',
'renderer/render_view_mouse_lock_dispatcher.h',
+ 'renderer/render_view_pepper_helper.cc',
+ 'renderer/render_view_pepper_helper.h',
'renderer/render_widget.cc',
'renderer/render_widget.h',
'renderer/render_widget_fullscreen.cc',
@@ -369,6 +368,17 @@
'renderer/p2p/socket_dispatcher.h',
],
}],
+ ['enable_plugins==1', {
+ 'dependencies': [
+ '../ppapi/ppapi_internal.gyp:ppapi_host',
+ '../ppapi/ppapi_internal.gyp:ppapi_proxy',
+ '../ppapi/ppapi_internal.gyp:ppapi_shared',
+ ],
+ }, { # enable_plugins==0
+ 'sources/': [
+ ['exclude', '^renderer/pepper/'],
+ ],
+ }],
['java_bridge==1', {
'defines': [
'ENABLE_JAVA_BRIDGE',

Powered by Google App Engine
This is Rietveld 408576698