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 /testing/chromoting | |
| 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 'testing/chromoting')
| -rw-r--r-- | testing/chromoting/chromoting_integration_tests.isolate | 1 | ||||
| -rw-r--r-- | testing/chromoting/dependencies.gypi | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/testing/chromoting/chromoting_integration_tests.isolate b/testing/chromoting/chromoting_integration_tests.isolate index bb32a01..c879e56 100644 --- a/testing/chromoting/chromoting_integration_tests.isolate +++ b/testing/chromoting/chromoting_integration_tests.isolate @@ -49,6 +49,7 @@ 'files': [ '../test_env.py', '<(PRODUCT_DIR)/browser_tests<(EXECUTABLE_SUFFIX)', + '<(PRODUCT_DIR)/remoting/remoting.webapp/', '<(PRODUCT_DIR)/remoting/remoting.webapp.v2/', '<(PRODUCT_DIR)/remoting/browser_test_resources/', '<(PRODUCT_DIR)/resources.pak', diff --git a/testing/chromoting/dependencies.gypi b/testing/chromoting/dependencies.gypi index fd74e3a..b2bec1e 100644 --- a/testing/chromoting/dependencies.gypi +++ b/testing/chromoting/dependencies.gypi @@ -7,7 +7,8 @@ { 'dependencies': [ '../../chrome/chrome.gyp:browser_tests', - '../../remoting/remoting.gyp:remoting_webapp', + '../../remoting/remoting.gyp:remoting_webapp_v1', + '../../remoting/remoting.gyp:remoting_webapp_v2', ], 'type': 'none', 'includes': [ |