diff options
| author | Mitsuru Oshima <oshima@chromium.org> | 2015-08-03 22:03:43 -0700 |
|---|---|---|
| committer | Mitsuru Oshima <oshima@chromium.org> | 2015-08-04 05:07:28 +0000 |
| commit | c515714386ad95e116ef8b4e5577665ba70b1d24 (patch) | |
| tree | b0fc04ceb8bababcaa4f1ad53c1d63df3b90d7a5 /remoting/remoting_client.gypi | |
| parent | 65573534b0c4ca1e45c6763371556eeebcad28bd (diff) | |
| download | chromium_src-c515714386ad95e116ef8b4e5577665ba70b1d24.zip chromium_src-c515714386ad95e116ef8b4e5577665ba70b1d24.tar.gz chromium_src-c515714386ad95e116ef8b4e5577665ba70b1d24.tar.bz2 | |
Revert "Remove legacy CRD application types."
Reason for revert:
TSan bot build failuire:
KeyError: '/mnt/data/b/build/slave/Chromium_Linux_TSan_Builder/build/src/remoting/remoting.gyp:remoting_webapp#target'
Error: Command '/usr/bin/python src/build/gyp_chromium' returned non-zero exit status 1 in /mnt/data/b/build/slave/Chromium_Linux_TSan_Builder/build
>
> Remove legacy CRD application types.
>
> 1. Removed CRD v1 app.
> 2. Removed support for native plugin from the webapp.
>
> Review URL: https://codereview.chromium.org/1251273002
>
> Cr-Commit-Position: refs/heads/master@{#341635}
BUG=516539
TBR=sergeyu@chromium.org
Review URL: https://codereview.chromium.org/1270693003 .
Cr-Commit-Position: refs/heads/master@{#341684}
Diffstat (limited to 'remoting/remoting_client.gypi')
| -rw-r--r-- | remoting/remoting_client.gypi | 34 |
1 files changed, 31 insertions, 3 deletions
diff --git a/remoting/remoting_client.gypi b/remoting/remoting_client.gypi index bb37e6e0..3d53e39 100644 --- a/remoting/remoting_client.gypi +++ b/remoting/remoting_client.gypi @@ -151,19 +151,47 @@ }, ], }, + { + # GN version: //remoting/webapp:webapp + 'target_name': 'remoting_webapp', + 'type': 'none', + 'dependencies': [ + 'remoting_client_credits', + 'remoting_webapp_v1', + ], + 'conditions': [ + ['disable_nacl==0 and disable_nacl_untrusted==0', { + 'dependencies': [ + 'remoting_webapp_v2', + ], + }] + ], + }, # end of target 'remoting_webapp' + + { + # GN version: //remoting/webapp:webapp_v1 + 'target_name': 'remoting_webapp_v1', + 'type': 'none', + 'variables': { + 'webapp_type': 'v1', + 'output_dir': '<(PRODUCT_DIR)/remoting/remoting.webapp', + 'zip_path': '<(PRODUCT_DIR)/remoting-webapp.zip', + }, + 'includes': [ 'remoting_webapp.gypi', ], + }, # end of target 'remoting_webapp_v1' ], # end of targets 'conditions': [ ['disable_nacl==0 and disable_nacl_untrusted==0', { 'targets': [ { - # GN version: //remoting/webapp - 'target_name': 'remoting_webapp', + # GN version: //remoting/webapp:webapp_v1 + 'target_name': 'remoting_webapp_v2', 'type': 'none', 'variables': { 'output_dir': '<(PRODUCT_DIR)/remoting/remoting.webapp.v2', 'zip_path': '<(PRODUCT_DIR)/remoting-webapp.v2.zip', - 'webapp_type': 'desktop', + 'webapp_type': 'v2_pnacl', 'extra_files': [ 'webapp/crd/remoting_client_pnacl.nmf.jinja2', '<(PRODUCT_DIR)/remoting_client_plugin_newlib.pexe', |