diff options
| author | sergiyb <sergiyb@chromium.org> | 2015-01-24 11:31:11 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-01-24 19:32:01 +0000 |
| commit | c82e9b0a281f21501765b27a23cda508e11a5e1f (patch) | |
| tree | 9e0b81797bbf31a4e6bbb5faa49e9e422d804983 /remoting/remoting_client.gypi | |
| parent | 65ffdafc8538b14ad0cbdf6a57d9d21e1e882a9d (diff) | |
| download | chromium_src-c82e9b0a281f21501765b27a23cda508e11a5e1f.zip chromium_src-c82e9b0a281f21501765b27a23cda508e11a5e1f.tar.gz chromium_src-c82e9b0a281f21501765b27a23cda508e11a5e1f.tar.bz2 | |
Revert of Copy debug PNaCl plugin in Dev builds of the chromoting webapp. (patchset #1 id:1 of https://codereview.chromium.org/872633006/)
Reason for revert:
Broke compile, e.g. http://build.chromium.org/p/chromium/buildstatus?builder=Win&number=28337
Original issue's description:
> Copy debug PNaCl plugin in Dev builds of the chromoting webapp.
>
> With this change the Debug version of the PNaCl plugin will be copied to
> the webapp directory allowing to debug PNaCl plugin (using nacl-gdb).
>
> Also updated build-webapp.py to process all *.jinja2 input files as jinja2
> templates.
>
> BUG=451643
>
> Committed: https://crrev.com/65ffdafc8538b14ad0cbdf6a57d9d21e1e882a9d
> Cr-Commit-Position: refs/heads/master@{#313024}
TBR=jamiewalch@chromium.org,sergeyu@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=451643
Review URL: https://codereview.chromium.org/870273002
Cr-Commit-Position: refs/heads/master@{#313025}
Diffstat (limited to 'remoting/remoting_client.gypi')
| -rw-r--r-- | remoting/remoting_client.gypi | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/remoting/remoting_client.gypi b/remoting/remoting_client.gypi index e8f3efb..cf54377 100644 --- a/remoting/remoting_client.gypi +++ b/remoting/remoting_client.gypi @@ -159,22 +159,13 @@ 'zip_path': '<(PRODUCT_DIR)/remoting-webapp.v2_pnacl.zip', 'webapp_type': 'v2_pnacl', 'extra_files': [ - 'webapp/crd/remoting_client_pnacl.nmf.jinja2', + 'webapp/crd/remoting_client_pnacl.nmf', '<(PRODUCT_DIR)/remoting_client_plugin_newlib.pexe', ], }, 'dependencies': [ 'remoting_nacl.gyp:remoting_client_plugin_nacl', ], - 'conditions': [ - ['buildtype == "Dev"', { - 'variables': { - 'extra_files': [ - '<(PRODUCT_DIR)/remoting_client_plugin_newlib.pexe.debug', - ], - }, - }], - ], 'includes': [ 'remoting_webapp.gypi', ], }, # end of target 'remoting_webapp_v2_pnacl' ], |