diff options
| author | sergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-19 06:28:51 +0000 |
|---|---|---|
| committer | sergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-19 06:28:51 +0000 |
| commit | fd495c25ccc4448f41ad188e602582c9032ef5d2 (patch) | |
| tree | d9285256eaa07a0dd06843139d7765c3faefafb6 /remoting/remoting_client.gypi | |
| parent | adc6cfd8f88b7841fb6e040d6ce0197b1aec0438 (diff) | |
| download | chromium_src-fd495c25ccc4448f41ad188e602582c9032ef5d2.zip chromium_src-fd495c25ccc4448f41ad188e602582c9032ef5d2.tar.gz chromium_src-fd495c25ccc4448f41ad188e602582c9032ef5d2.tar.bz2 | |
Revert 271343 "Build remoting for PNaCl"
> Build remoting for PNaCl
>
> BUG=276739
> R=jamiewalch@chromium.org, rsleevi@chromium.org
>
> Review URL: https://codereview.chromium.org/234023003
TBR=sergeyu@chromium.org
Review URL: https://codereview.chromium.org/285243003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@271344 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting/remoting_client.gypi')
| -rw-r--r-- | remoting/remoting_client.gypi | 26 |
1 files changed, 0 insertions, 26 deletions
diff --git a/remoting/remoting_client.gypi b/remoting/remoting_client.gypi index ce1de7b..e9d5b32d 100644 --- a/remoting/remoting_client.gypi +++ b/remoting/remoting_client.gypi @@ -101,13 +101,6 @@ 'remoting_webapp_v1', 'remoting_webapp_v2', ], - 'conditions': [ - ['disable_nacl==0 and disable_nacl_untrusted==0', { - 'dependencies': [ - 'remoting_webapp_pnacl', - ], - }], - ], }, # end of target 'remoting_webapp' { @@ -134,23 +127,4 @@ '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_pnacl', - 'type': 'none', - 'variables': { - 'output_dir': '<(PRODUCT_DIR)/remoting/remoting.webapp.pnacl', - 'zip_path': '<(PRODUCT_DIR)/remoting-webapp-pnacl.zip', - 'extra_files': [ 'webapp/background.js' ], - 'webapp_type': 'v2_pnacl', - }, - 'includes': [ 'remoting_webapp.gypi', ], - }, # end of target 'remoting_webapp_pnacl' - ], - }], - ], - } |