diff options
| author | sergeyu <sergeyu@chromium.org> | 2015-03-23 11:37:28 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-03-23 18:38:19 +0000 |
| commit | c61851d5cce85f0bbae6b35a2f2e75bdb91e3cd8 (patch) | |
| tree | b0acf78cffdf8ae1c81f697397287a62f6d0e08d /remoting | |
| parent | d83bdf0a3ae40a893ccc349615786dcb0f304dcc (diff) | |
| download | chromium_src-c61851d5cce85f0bbae6b35a2f2e75bdb91e3cd8.zip chromium_src-c61851d5cce85f0bbae6b35a2f2e75bdb91e3cd8.tar.gz chromium_src-c61851d5cce85f0bbae6b35a2f2e75bdb91e3cd8.tar.bz2 | |
Enable PNaCl for V2 CRD app
BUG=469763
Review URL: https://codereview.chromium.org/1022983003
Cr-Commit-Position: refs/heads/master@{#321815}
Diffstat (limited to 'remoting')
| -rw-r--r-- | remoting/remoting_client.gypi | 18 |
1 files changed, 3 insertions, 15 deletions
diff --git a/remoting/remoting_client.gypi b/remoting/remoting_client.gypi index aa4cf13..dd13d4d 100644 --- a/remoting/remoting_client.gypi +++ b/remoting/remoting_client.gypi @@ -129,12 +129,11 @@ 'type': 'none', 'dependencies': [ 'remoting_webapp_v1', - 'remoting_webapp_v2', ], 'conditions': [ ['disable_nacl==0 and disable_nacl_untrusted==0', { 'dependencies': [ - 'remoting_webapp_v2_pnacl', + 'remoting_webapp_v2', ], }] ], @@ -150,24 +149,13 @@ }, 'includes': [ 'remoting_webapp.gypi', ], }, # end of target 'remoting_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': 'v2', - }, - 'includes': [ 'remoting_webapp.gypi', ], - }, # end of target 'remoting_webapp_v2' ], # end of targets 'conditions': [ ['disable_nacl==0 and disable_nacl_untrusted==0', { 'targets': [ { - 'target_name': 'remoting_webapp_v2_pnacl', + 'target_name': 'remoting_webapp_v2', 'type': 'none', 'variables': { 'output_dir': '<(PRODUCT_DIR)/remoting/remoting.webapp.v2_pnacl', @@ -191,7 +179,7 @@ }], ], 'includes': [ 'remoting_webapp.gypi', ], - }, # end of target 'remoting_webapp_v2_pnacl' + }, # end of target 'remoting_webapp_v2' ], }], ], |