| Index: content/content_browser.gypi
|
| diff --git a/content/content_browser.gypi b/content/content_browser.gypi
|
| index 925fddb4f7535b5c6d5ec3514c35c2d6d43de729..7d5744ddd75389f31b2d6dbb89c3f0b64d233406 100644
|
| --- a/content/content_browser.gypi
|
| +++ b/content/content_browser.gypi
|
| @@ -930,7 +930,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',
|
| @@ -1123,6 +1122,18 @@
|
| ['exclude', '^browser/renderer_host/tap_suppression_controller_aura.cc'],
|
| ],
|
| }],
|
| + ['enable_plugins==1', {
|
| + 'dependencies': [
|
| + '../ppapi/ppapi_internal.gyp:ppapi_ipc',
|
| + ],
|
| + }, { # enable_plugins==0
|
| + 'sources!': [
|
| + 'browser/ppapi_plugin_process_host.cc',
|
| + ],
|
| + 'sources/': [
|
| + ['exclude', '^browser/renderer_host/pepper/'],
|
| + ],
|
| + }],
|
| ['java_bridge==1', {
|
| 'defines': [
|
| 'ENABLE_JAVA_BRIDGE',
|
|
|