diff options
author | dmaclach@chromium.org <dmaclach@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-09 21:45:45 +0000 |
---|---|---|
committer | dmaclach@chromium.org <dmaclach@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-09 21:45:45 +0000 |
commit | 147e7d4eb5d6882bb1c5bdca6b1b5e6b1ee2baa1 (patch) | |
tree | ca666d98a2f1b3ed88f34e40fae46c73866b3ecb /remoting/remoting.gyp | |
parent | 5b4d1f1b8ed5b92a31ea900aa632755658ee5036 (diff) | |
download | chromium_src-147e7d4eb5d6882bb1c5bdca6b1b5e6b1ee2baa1.zip chromium_src-147e7d4eb5d6882bb1c5bdca6b1b5e6b1ee2baa1.tar.gz chromium_src-147e7d4eb5d6882bb1c5bdca6b1b5e6b1ee2baa1.tar.bz2 |
Define NPAPI plugin target for host.
BUG=NONE
TEST=Build
Review URL: http://codereview.chromium.org/6927061
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@84691 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting/remoting.gyp')
-rw-r--r-- | remoting/remoting.gyp | 55 |
1 files changed, 51 insertions, 4 deletions
diff --git a/remoting/remoting.gyp b/remoting/remoting.gyp index e4d0169c..25aed80 100644 --- a/remoting/remoting.gyp +++ b/remoting/remoting.gyp @@ -4,7 +4,23 @@ { 'variables': { + # TODO(dmaclach): can we pick this up some other way? Right now it's + # duplicated from chrome.gyp 'chromium_code': 1, + 'conditions': [ + ['OS=="mac"', { + 'conditions': [ + ['branding=="Chrome"', { + 'mac_bundle_id': 'com.google.Chrome', + 'mac_creator': 'rimZ', + }, { # else: branding!="Chrome" + 'mac_bundle_id': 'org.chromium.Chromium', + 'mac_creator': 'Cr24', + }], # branding + ], # conditions + + }], + ], }, 'target_defaults': { @@ -59,12 +75,11 @@ }, # end of target 'chromoting_x11_client' ], }], # end of OS conditions for x11 client - ], # end of 'conditions' 'targets': [ { - 'target_name': 'chromoting_plugin', + 'target_name': 'chromoting_client_plugin', 'type': 'static_library', 'defines': [ 'HAVE_STDINT_H', # Required by on2_integer.h @@ -108,8 +123,40 @@ '../media/base/yuv_row_win.cc', '../media/base/yuv_row_posix.cc', ], - }, # end of target 'chromoting_plugin' - + }, # end of target 'chromoting_client_plugin' + { + 'target_name': 'chromoting_host_plugin', + 'type': 'loadable_module', + 'defines': [ + ], + 'dependencies': [ + 'chromoting_base', + 'chromoting_host', + '../third_party/npapi/npapi.gyp:npapi', + ], + 'sources': [ + 'host/host_plugin.cc', + ], + 'conditions': [ + ['OS=="mac"', { + 'mac_bundle': 1, + 'xcode_settings': { + 'CHROMIUM_BUNDLE_ID': '<(mac_bundle_id)', + 'INFOPLIST_FILE': 'host/host_plugin-Info.plist', + 'WRAPPER_EXTENSION': 'plugin', + }, + # TODO(mark): Come up with a fancier way to do this. It should + # only be necessary to list framework-Info.plist once, not the + # three times it is listed here. + 'mac_bundle_resources': [ + 'host/host_plugin-Info.plist', + ], + 'mac_bundle_resources!': [ + 'host/host_plugin-Info.plist', + ], + }], + ], + }, # end of target 'chromoting_host_plugin' { 'target_name': 'chromoting_base', 'type': '<(library)', |