Start building the NPAPI layout test plugin on the Mac (it's been buildable

for a while, but evidently got missed in the grand conversion to gyp)
Review URL: http://codereview.chromium.org/100051

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@14631 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 48 insertions, 30 deletions

diff --git a/webkit/tools/test_shell/test_shell.gyp b/webkit/tools/test_shell/test_shell.gyp
index 617d07c..a2e03bb 100644
--- a/webkit/tools/test_shell/test_shell.gyp
+++ b/webkit/tools/test_shell/test_shell.gyp
@@ -106,10 +106,14 @@
         '../../webkit.gyp:webkit',
       ],
       'conditions': [
+        ['OS!="win"', {
+          'dependencies': [
+            'npapi_layout_test_plugin',
+          ],
+        }],
         ['OS=="linux"', {
           'dependencies': [
             'test_shell_resources',
-            'npapi_layout_test_plugin',
             'npapi_test_plugin',
             '../../../build/linux/system.gyp:gtk',
           ],
@@ -244,6 +248,49 @@
       ],
     },
     {
+      'target_name': 'npapi_layout_test_plugin',
+      'type': 'loadable_module',
+      'mac_bundle': 1,
+      'product_dir': '<(PRODUCT_DIR)/plugins',
+      'msvs_guid': 'BE6D5659-A8D5-4890-A42C-090DD10EF62C',
+      'sources': [
+        '../npapi_layout_test_plugin/PluginObject.cpp',
+        '../npapi_layout_test_plugin/TestObject.cpp',
+        '../npapi_layout_test_plugin/main.cpp',
+        '../npapi_layout_test_plugin/npapi_layout_test_plugin.def',
+        '../npapi_layout_test_plugin/npapi_layout_test_plugin.rc',
+      ],
+      'include_dirs': [
+        '../../..',
+      ],
+      'dependencies': [
+        '../../../third_party/npapi/npapi.gyp:npapi',
+        '../../webkit.gyp:wtf',
+      ],
+      'msvs_disabled_warnings': [ 4996 ],
+      'mac_bundle_resources': [
+        '../npapi_layout_test_plugin/Info.r',
+      ],
+      'xcode_settings': {
+        'INFOPLIST_FILE': '../npapi_layout_test_plugin/Info.plist',
+      },
+      'conditions': [
+        ['OS!="win"', {
+          'sources!': [
+            '../npapi_layout_test_plugin/npapi_layout_test_plugin.def',
+            '../npapi_layout_test_plugin/npapi_layout_test_plugin.rc',
+          ],
+        }],
+        ['OS=="mac", {
+          'link_settings': {
+            'libraries': [
+              '$(SDKROOT)/System/Library/Frameworks/Carbon.framework',
+            ],
+          },
+        }],
+      ],
+    },
+    {
       'target_name': 'test_shell_tests',
       'type': 'executable',
       'msvs_guid': 'E6766F81-1FCD-4CD7-BC16-E36964A14867',
@@ -434,35 +481,6 @@
             }],
           ],
         },
-        {
-          'target_name': 'npapi_layout_test_plugin',
-          'type': 'loadable_module',
-          'product_dir': '<(PRODUCT_DIR)/plugins',
-          'msvs_guid': 'BE6D5659-A8D5-4890-A42C-090DD10EF62C',
-          'sources': [
-            '../npapi_layout_test_plugin/PluginObject.cpp',
-            '../npapi_layout_test_plugin/TestObject.cpp',
-            '../npapi_layout_test_plugin/main.cpp',
-            '../npapi_layout_test_plugin/npapi_layout_test_plugin.def',
-            '../npapi_layout_test_plugin/npapi_layout_test_plugin.rc',
-          ],
-          'include_dirs': [
-            '../../..',
-          ],
-          'dependencies': [
-            '../../../third_party/npapi/npapi.gyp:npapi',
-            '../../webkit.gyp:wtf',
-          ],
-          'msvs_disabled_warnings': [ 4996 ],
-          'conditions': [
-            ['OS!="win"', {
-              'sources!': [
-                '../npapi_layout_test_plugin/npapi_layout_test_plugin.def',
-                '../npapi_layout_test_plugin/npapi_layout_test_plugin.rc',
-              ],
-            }],
-          ],
-        },
       ],
     }],
     # Need to do the same for Win and Linux. We build a separate dylib/dll/so