diff options
| author | jhawkins <jhawkins@chromium.org> | 2015-06-22 11:39:54 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-06-22 18:40:48 +0000 |
| commit | 13c5c463e5ac7e561b4d3d919010d7b206509f5e (patch) | |
| tree | b1529d0db0fec389b400e4aa9b44c01ba3bcf025 /remoting/remoting_webapp_files.gypi | |
| parent | 1fbc9540c7a729001f34e2c0d8418f16186ef679 (diff) | |
| download | chromium_src-13c5c463e5ac7e561b4d3d919010d7b206509f5e.zip chromium_src-13c5c463e5ac7e561b4d3d919010d7b206509f5e.tar.gz chromium_src-13c5c463e5ac7e561b4d3d919010d7b206509f5e.tar.bz2 | |
Reland crrev.com/335097 w/ the following fixes:
- Remove now unused qunit_proto.js
- Ensure the gyp variable has _files in the name, as that implies
special (necessary) path handling
--
chromoting: Add JS externs for qunit.
This is one of a few fixes needed to enable ES6 mode in remoting/.
BUG=481705
Committed: https://crrev.com/ffbf1b6110ff79b0f9683a4f4acc67baf4900499
Cr-Commit-Position: refs/heads/master@{#335097}
Review URL: https://codereview.chromium.org/1195643002
Cr-Commit-Position: refs/heads/master@{#335532}
Diffstat (limited to 'remoting/remoting_webapp_files.gypi')
| -rw-r--r-- | remoting/remoting_webapp_files.gypi | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/remoting/remoting_webapp_files.gypi b/remoting/remoting_webapp_files.gypi index eb3b5965..60aa74b 100644 --- a/remoting/remoting_webapp_files.gypi +++ b/remoting/remoting_webapp_files.gypi @@ -15,6 +15,11 @@ { 'variables': { + # JSCompiler externs. + 'remoting_webapp_js_externs_files': [ + 'webapp/externs/qunit.js', + ], + # Jscompile proto files. # These provide type information for jscompile. 'remoting_webapp_js_proto_files': [ @@ -125,7 +130,6 @@ 'webapp/js_proto/chrome_proto.js', 'webapp/js_proto/dom_proto.js', 'webapp/js_proto/remoting_proto.js', - 'webapp/js_proto/qunit_proto.js', 'webapp/js_proto/sinon_proto.js', ], 'remoting_webapp_unittests_all_js_files': [ |