| Index: remoting/remoting.gyp
|
| diff --git a/remoting/remoting.gyp b/remoting/remoting.gyp
|
| index e81aa687bf22b172a49f478ca174dbd16f3e6c0e..ac31f8b2089429c3916f432a895b6491bd50730c 100644
|
| --- a/remoting/remoting.gyp
|
| +++ b/remoting/remoting.gyp
|
| @@ -11,6 +11,17 @@
|
| # is brand-dependent and is defined further down.
|
| 'host_plugin_mime_type': 'application/vnd.chromium.remoting-host',
|
| 'host_plugin_description': 'Allow another user to access your computer securely over the Internet.',
|
| +
|
| + # Variables for common_constants (used by JS unittests).
|
| + 'variables': {
|
| + 'version_py_path': '../chrome/tools/build/version.py',
|
| + 'version_path': '../chrome/VERSION',
|
| + },
|
| + 'version_py_path': '<(version_py_path)',
|
| + 'version_path': '<(version_path)',
|
| + 'version_full':
|
| + '<!(python <(version_py_path) -f <(version_path) -t "@MAJOR@.@MINOR@.@BUILD@.@PATCH@")',
|
| +
|
| 'conditions': [
|
| ['OS=="mac"', {
|
| 'conditions': [
|
| @@ -138,6 +149,12 @@
|
| ],
|
| },
|
|
|
| + 'includes': [
|
| + # The common_constants target is needed for the JS unittests.
|
| + '../chrome/common_constants.gypi',
|
| + '../chrome/js_unittest_vars.gypi',
|
| + ],
|
| +
|
| 'target_defaults': {
|
| 'defines': [
|
| ],
|
| @@ -147,6 +164,14 @@
|
| },
|
|
|
| 'conditions': [
|
| + ['OS == "win"', {
|
| + 'includes': [
|
| + # Required for JS unittests.
|
| + '../chrome/chrome_common.gypi',
|
| + '../chrome/chrome_installer.gypi',
|
| + '../chrome/chrome_installer_util.gypi',
|
| + ],
|
| + }], # 'OS == "win"'
|
| ['os_posix == 1', {
|
| 'targets': [
|
| # Simple webserver for testing remoting client plugin.
|
| @@ -158,7 +183,7 @@
|
| ],
|
| }
|
| ], # end of target 'remoting_client_test_webserver'
|
| - }],
|
| + }], # 'os_posix == 1'
|
| ['OS=="linux"', {
|
| 'targets': [
|
| # Linux breakpad processing
|
| @@ -865,6 +890,7 @@
|
| 'target_name': 'remoting_unittests',
|
| 'type': 'executable',
|
| 'dependencies': [
|
| + 'common_constants', # from common_constants.gypi
|
| 'remoting_base',
|
| 'remoting_client',
|
| 'remoting_host',
|
| @@ -874,14 +900,21 @@
|
| '../base/base.gyp:base_i18n',
|
| '../base/base.gyp:test_support_base',
|
| '../media/media.gyp:media',
|
| - '../ui/ui.gyp:ui',
|
| '../testing/gmock.gyp:gmock',
|
| '../testing/gtest.gyp:gtest',
|
| + '../ui/ui.gyp:ui',
|
| + '../v8/tools/gyp/v8.gyp:v8',
|
| ],
|
| 'include_dirs': [
|
| '../testing/gmock/include',
|
| ],
|
| + 'includes': [
|
| + '../chrome/js_unittest_rules.gypi',
|
| + ],
|
| 'sources': [
|
| + '../chrome/test/base/v8_unit_test.cc',
|
| + '../chrome/test/base/v8_unit_test.h',
|
| + '../chrome/test/base/run_all_remoting_unittests.cc',
|
| 'base/auth_token_util_unittest.cc',
|
| 'base/codec_test.cc',
|
| 'base/codec_test.h',
|
| @@ -931,7 +964,8 @@
|
| 'protocol/rtp_video_reader_unittest.cc',
|
| 'protocol/rtp_video_writer_unittest.cc',
|
| 'protocol/v1_authenticator_unittest.cc',
|
| - 'run_all_unittests.cc',
|
| + 'webapp/me2mom/debug_log.gtestjs',
|
| + 'webapp/me2mom/debug_log.js',
|
| ],
|
| 'conditions': [
|
| ['toolkit_uses_gtk == 1', {
|
| @@ -952,6 +986,12 @@
|
| ],
|
| ],
|
| }],
|
| + ['OS == "win"', {
|
| + 'dependencies': [
|
| + # Required for JS unittests.
|
| + 'installer_util',
|
| + ],
|
| + }], # 'OS == "win"'
|
| ], # end of 'conditions'
|
| }, # end of target 'remoting_unittests'
|
| ], # end of targets
|
|
|