| Index: chrome/chrome.gyp
|
| diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp
|
| index f3923231d64c7e81dc7606cf54e430559308ac1b..2a3addf7bf20404fc13074b8ce8bd024b6984115 100644
|
| --- a/chrome/chrome.gyp
|
| +++ b/chrome/chrome.gyp
|
| @@ -1537,27 +1537,38 @@
|
| ],
|
| },
|
| 'conditions': [
|
| + # Plugin code.
|
| + ['OS=="linux" or OS=="win"', {
|
| + 'dependencies': [
|
| + 'plugin',
|
| + ],
|
| + }],
|
| + # Linux-specific rules.
|
| ['OS=="linux"', {
|
| 'dependencies': [
|
| '../build/linux/system.gyp:gtk',
|
| ],
|
| }],
|
| + # Windows-specific rules.
|
| ['OS=="win"', {
|
| 'include_dirs': [
|
| 'third_party/wtl/include',
|
| ],
|
| - 'dependencies': [
|
| - 'plugin',
|
| - ],
|
| },],
|
| + # As of yet unported-from-Windows code.
|
| ['OS!="win"', {
|
| 'sources!': [
|
| - 'renderer/plugin_channel_host.cc',
|
| - 'renderer/webplugin_delegate_proxy.cc',
|
| 'renderer/webworker_proxy.cc',
|
| 'renderer/webworker_proxy.h',
|
| ],
|
| },],
|
| + # As of yet unported-to-Mac code.
|
| + ['OS=="mac"', {
|
| + 'sources!': [
|
| + 'renderer/plugin_channel_host.cc',
|
| + 'renderer/webplugin_delegate_proxy.cc',
|
| + ]
|
| + },],
|
| ],
|
| },
|
| {
|
| @@ -2829,7 +2840,7 @@
|
| },
|
| ],
|
| }], # OS=="win" or OS=="linux"
|
| - ['OS=="win"',
|
| + ['OS=="win" or OS=="linux"',
|
| { 'targets': [
|
| {
|
| 'target_name': 'plugin',
|
| @@ -2887,6 +2898,10 @@
|
| },],
|
| ],
|
| },
|
| + ]}, # 'targets'
|
| + ], # OS=="win" or OS=="linux"
|
| + ['OS=="win"',
|
| + { 'targets': [
|
| {
|
| 'target_name': 'worker',
|
| 'type': '<(library)',
|
|
|