diff options
author | Zeno Albisser <zeno.albisser@digia.com> | 2013-11-21 14:09:57 +0100 |
---|---|---|
committer | Andras Becsi <andras.becsi@digia.com> | 2013-11-29 15:14:36 +0100 |
commit | eb32ba6f51d0c21d58cd7d89785285ff8fa64624 (patch) | |
tree | 2c7c940e1dbee81b89d935626110816b494aa32c /chromium/remoting | |
parent | 9427c1a0222ebd67efef1a2c7990a0fa5c9aac84 (diff) | |
download | qtwebengine-chromium-eb32ba6f51d0c21d58cd7d89785285ff8fa64624.tar.gz |
Update chromium to branch 1599.
Change-Id: I04e775a946a208bb4500d3b722bcb05c82b9d7cb
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
Diffstat (limited to 'chromium/remoting')
-rw-r--r-- | chromium/remoting/remoting.gyp | 40 |
1 files changed, 30 insertions, 10 deletions
diff --git a/chromium/remoting/remoting.gyp b/chromium/remoting/remoting.gyp index 6e856a85fb8..e70f5f1eab2 100644 --- a/chromium/remoting/remoting.gyp +++ b/chromium/remoting/remoting.gyp @@ -82,16 +82,17 @@ ['OS=="win"', { 'host_plugin_extension': 'dll', 'host_plugin_prefix': '', + }], + ['OS=="win"', { # Use auto-generated CLSIDs to make sure that the newly installed COM # classes will be used during/after upgrade even if there are old # instances running already. - # The parameter at the end is ignored, but needed to make sure that the - # script will be invoked separately for each CLSID. Otherwise GYP will - # reuse the value returned by the first invocation of the script. - 'daemon_controller_clsid': - '<!(python -c "import uuid; print uuid.uuid4()" 1)', - 'rdp_desktop_session_clsid': - '<!(python -c "import uuid; print uuid.uuid4()" 2)', + # The parameter passed to uuidgen.py is ignored, but needed to make sure + # that the script will be invoked separately for each CLSID. Otherwise + # GYP will reuse the value returned by the first invocation of + # the script. + 'daemon_controller_clsid': '<!(python tools/uuidgen.py 1)', + 'rdp_desktop_session_clsid': '<!(python tools/uuidgen.py 2)', }], ], @@ -133,7 +134,6 @@ 'webapp/main.html', 'webapp/manifest.json', 'webapp/menu_button.css', - 'webapp/oauth2_callback.html', 'webapp/open_sans.css', 'webapp/open_sans.woff', 'webapp/scale-to-fit.webp', @@ -171,7 +171,6 @@ 'webapp/menu_button.js', 'webapp/oauth2.js', 'webapp/oauth2_api.js', - 'webapp/oauth2_callback.js', 'webapp/paired_client_manager.js', 'webapp/plugin_settings.js', 'webapp/remoting.js', @@ -564,6 +563,27 @@ }, # end of target 'remoting_me2me_host_static' { + 'target_name': 'remoting_host_keygen', + 'type': 'executable', + 'dependencies': [ + 'remoting_base', + '../base/base.gyp:base', + '../base/base.gyp:base_i18n', + '../crypto/crypto.gyp:crypto', + ], + 'sources': [ + 'host/keygen_main.cc', + ], + 'conditions': [ + ['OS=="linux" and linux_use_tcmalloc==1', { + 'dependencies': [ + '../base/allocator/allocator.gyp:allocator', + ], + }], + ], + }, # end of target 'remoting_host_keygen' + + { 'target_name': 'remoting_host_setup_base', 'type': 'static_library', 'variables': { 'enable_wexit_time_destructors': 1, }, @@ -1725,7 +1745,7 @@ }, # end of target 'remoting_host_messages' # Generates localized the version information resources for the Windows - # binaries. + # binaries. # The substitution strings are taken from: # - build/util/LASTCHANGE - the last source code revision. # - chrome/VERSION - the major, build & patch versions. |