diff options
| author | dmaclach@chromium.org <dmaclach@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-11 04:17:36 +0000 |
|---|---|---|
| committer | dmaclach@chromium.org <dmaclach@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-11 04:17:36 +0000 |
| commit | 8164ae1c8061f04a3da53ee01e7134ab540db66a (patch) | |
| tree | 3108efb48a857a7fe2cbbdf37ab0a1e75ad31856 /remoting/remoting.gyp | |
| parent | bb22dd5adfcd59c9d73417e3a826cd419a6c81a3 (diff) | |
| download | chromium_src-8164ae1c8061f04a3da53ee01e7134ab540db66a.zip chromium_src-8164ae1c8061f04a3da53ee01e7134ab540db66a.tar.gz chromium_src-8164ae1c8061f04a3da53ee01e7134ab540db66a.tar.bz2 | |
Revert 84923 - Build a "real" webapp deliverable and add plugin to it.
BUG=NONE
TEST=BUILD
Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=84843
Review URL: http://codereview.chromium.org/6998009
TBR=dmaclach@chromium.org
Review URL: http://codereview.chromium.org/7001021
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@84927 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting/remoting.gyp')
| -rw-r--r-- | remoting/remoting.gyp | 43 |
1 files changed, 2 insertions, 41 deletions
diff --git a/remoting/remoting.gyp b/remoting/remoting.gyp index 6480ad5..d486f08 100644 --- a/remoting/remoting.gyp +++ b/remoting/remoting.gyp @@ -18,16 +18,7 @@ 'mac_creator': 'Cr24', }], # branding ], # conditions - 'plugin_extension': 'plugin', - 'plugin_prefix': '', - }], - ['OS=="linux"', { - 'plugin_extension': 'so', - 'plugin_prefix': 'lib', - }], - ['OS=="win"', { - 'plugin_extension': 'dll', - 'plugin_prefix': '', + }], ], }, @@ -152,7 +143,7 @@ 'xcode_settings': { 'CHROMIUM_BUNDLE_ID': '<(mac_bundle_id)', 'INFOPLIST_FILE': 'host/host_plugin-Info.plist', - 'WRAPPER_EXTENSION': '<(plugin_extension)', + '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 @@ -167,36 +158,6 @@ ], }, # end of target 'chromoting_host_plugin' { - 'target_name': 'webapp_me2mom', - 'type': 'none', - 'dependencies': [ - 'chromoting_host_plugin', - ], - 'sources': [ - 'webapp/build-webapp.py', - ], - 'sources!': [ - 'webapp/build-webapp.py', - ], - 'actions': [ - { - 'action_name': 'Build Me2Mom WebApp', - 'inputs': [ - 'webapp/me2mom/', - '<(PRODUCT_DIR)/<(plugin_prefix)chromoting_host_plugin.<(plugin_extension)', - ], - 'outputs': [ - '<(PRODUCT_DIR)/remoting/remoting-me2mom.webapp', - ], - 'action': [ - 'python', 'webapp/build-webapp.py', - '<@(_inputs)', - '<@(_outputs)' - ], - }, - ], - }, # end of target 'webapp_me2mom' - { 'target_name': 'chromoting_base', 'type': '<(library)', 'dependencies': [ |