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

Unified Diff: content/content_browser.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
Index: content/content_browser.gypi
diff --git a/content/content_browser.gypi b/content/content_browser.gypi
index f35d9f17f64ea20a06ef284fdaee7068a73b5688..f3f6f460be0b52489b80e159991dc999733e8248 100644
--- a/content/content_browser.gypi
+++ b/content/content_browser.gypi
@@ -929,7 +929,6 @@
'browser/debugger/devtools_resources.gyp:devtools_resources',
'../cc/cc.gyp:cc',
'../net/net.gyp:http_server',
- '../ppapi/ppapi_internal.gyp:ppapi_ipc',
'../printing/printing.gyp:printing',
'<(webkit_src_dir)/Source/WebKit/chromium/WebKit.gyp:webkit',
'../ui/surface/surface.gyp:surface',
@@ -1122,6 +1121,18 @@
['exclude', '^browser/renderer_host/tap_suppression_controller_aura.cc'],
],
}],
+ ['enable_ppapi==1', {
+ 'dependencies': [
+ '../ppapi/ppapi_internal.gyp:ppapi_ipc',
+ ],
+ }, { # enable_ppapi==0
+ 'sources!': [
+ 'browser/ppapi_plugin_process_host.cc',
+ ],
+ 'sources/': [
+ ['exclude', '^browser/renderer_host/pepper/'],
+ ],
+ }],
['java_bridge==1', {
'defines': [
'ENABLE_JAVA_BRIDGE',

Powered by Google App Engine
This is Rietveld 408576698