diff options
author | Andras Becsi <andras.becsi@digia.com> | 2013-12-11 21:33:03 +0100 |
---|---|---|
committer | Andras Becsi <andras.becsi@digia.com> | 2013-12-13 12:34:07 +0100 |
commit | f2a33ff9cbc6d19943f1c7fbddd1f23d23975577 (patch) | |
tree | 0586a32aa390ade8557dfd6b4897f43a07449578 /chromium/remoting | |
parent | 5362912cdb5eea702b68ebe23702468d17c3017a (diff) | |
download | qtwebengine-chromium-f2a33ff9cbc6d19943f1c7fbddd1f23d23975577.tar.gz |
Update Chromium to branch 1650 (31.0.1650.63)
Change-Id: I57d8c832eaec1eb2364e0a8e7352a6dd354db99f
Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
Diffstat (limited to 'chromium/remoting')
-rw-r--r-- | chromium/remoting/remoting.gyp | 184 |
1 files changed, 101 insertions, 83 deletions
diff --git a/chromium/remoting/remoting.gyp b/chromium/remoting/remoting.gyp index e70f5f1eab2..092fbb69fed 100644 --- a/chromium/remoting/remoting.gyp +++ b/chromium/remoting/remoting.gyp @@ -82,17 +82,16 @@ ['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 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)', + # 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)', }], ], @@ -127,6 +126,8 @@ 'resources/icon_warning.webp', 'resources/infographic_my_computers.webp', 'resources/infographic_remote_assistance.webp', + 'resources/plus.webp', + 'resources/reload.webp', 'resources/tick.webp', 'webapp/connection_history.css', 'webapp/connection_stats.css', @@ -274,6 +275,7 @@ '../google_apis/google_apis.gyp:google_apis', '../ipc/ipc.gyp:ipc', '../third_party/webrtc/modules/modules.gyp:desktop_capture', + '../ui/ui.gyp:keycode_converter', ], 'defines': [ 'VERSION=<(version_full)', @@ -563,27 +565,6 @@ }, # 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, }, @@ -596,10 +577,14 @@ 'VERSION=<(version_full)', ], 'sources': [ + 'host/setup/daemon_controller.cc', 'host/setup/daemon_controller.h', - 'host/setup/daemon_controller_linux.cc', - 'host/setup/daemon_controller_mac.mm', - 'host/setup/daemon_controller_win.cc', + 'host/setup/daemon_controller_delegate_linux.cc', + 'host/setup/daemon_controller_delegate_linux.h', + 'host/setup/daemon_controller_delegate_mac.h', + 'host/setup/daemon_controller_delegate_mac.mm', + 'host/setup/daemon_controller_delegate_win.cc', + 'host/setup/daemon_controller_delegate_win.h', 'host/setup/daemon_installer_win.cc', 'host/setup/daemon_installer_win.h', 'host/setup/host_starter.cc', @@ -610,6 +595,8 @@ 'host/setup/native_messaging_reader.h', 'host/setup/native_messaging_writer.cc', 'host/setup/native_messaging_writer.h', + 'host/setup/oauth_client.cc', + 'host/setup/oauth_client.h', 'host/setup/oauth_helper.cc', 'host/setup/oauth_helper.h', 'host/setup/pin_validator.cc', @@ -1147,6 +1134,7 @@ 'remoting_host_prefpane', 'remoting_host_uninstaller', 'remoting_me2me_host', + 'remoting_native_messaging_host', ], 'variables': { 'host_name': '<!(python <(version_py_path) -f <(branding_path) -t "@HOST_PLUGIN_FILE_NAME@")', @@ -1168,11 +1156,15 @@ '<(PRODUCT_DIR)/remoting_host_prefpane.prefPane', '<(PRODUCT_DIR)/remoting_me2me_host.app', '<(PRODUCT_DIR)/remoting_host_uninstaller.app', + '<(PRODUCT_DIR)/remoting_native_messaging_host', + '<(PRODUCT_DIR)/remoting/com.google.chrome.remote_desktop.json', ], 'generated_files_dst': [ 'PreferencePanes/org.chromium.chromoting.prefPane', 'PrivilegedHelperTools/org.chromium.chromoting.me2me_host.app', 'Applications/<(host_uninstaller_name).app', + 'PrivilegedHelperTools/org.chromium.chromoting.me2me_host.app/Contents/MacOS/native_messaging_host', + 'Config/com.google.chrome.remote_desktop.json', ], 'source_files': [ '<@(remoting_host_installer_mac_files)', @@ -1745,7 +1737,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. @@ -1870,6 +1862,8 @@ ], 'variables': { 'apk_name': 'Chromoting', + 'android_app_version_name': '<(version_full)', + 'android_app_version_code': '<!(python ../build/util/lastchange.py --revision-only)', 'manifest_package_name': 'org.chromium.chromoting', 'native_lib_target': 'libremoting_client_jni', 'java_in_dir': 'android/java', @@ -1967,13 +1961,13 @@ 'generated_files': [ '<@(_compiled_inputs)', '<(sas_dll_path)/sas.dll', - '<(PRODUCT_DIR)/remoting/native_messaging_manifest.json', + '<(PRODUCT_DIR)/remoting/com.google.chrome.remote_desktop.json', 'resources/chromoting.ico', ], 'generated_files_dst': [ '<@(_compiled_inputs_dst)', 'files/sas.dll', - 'files/native_messaging_manifest.json', + 'files/com.google.chrome.remote_desktop.json', 'files/chromoting.ico', ], 'zip_path': '<(PRODUCT_DIR)/remoting-me2me-host-<(OS).zip', @@ -2068,8 +2062,12 @@ 'sources': [ 'client/plugin/chromoting_instance.cc', 'client/plugin/chromoting_instance.h', - 'client/plugin/mac_key_event_processor.cc', - 'client/plugin/mac_key_event_processor.h', + 'client/plugin/normalizing_input_filter.cc', + 'client/plugin/delegating_signal_strategy.cc', + 'client/plugin/delegating_signal_strategy.h', + 'client/plugin/normalizing_input_filter.h', + 'client/plugin/normalizing_input_filter_cros.cc', + 'client/plugin/normalizing_input_filter_mac.cc', 'client/plugin/pepper_audio_player.cc', 'client/plugin/pepper_audio_player.h', 'client/plugin/pepper_entrypoints.cc', @@ -2086,12 +2084,17 @@ 'client/plugin/pepper_port_allocator.h', 'client/plugin/pepper_token_fetcher.cc', 'client/plugin/pepper_token_fetcher.h', - 'client/plugin/pepper_view.cc', - 'client/plugin/pepper_view.h', 'client/plugin/pepper_util.cc', 'client/plugin/pepper_util.h', - 'client/plugin/pepper_signal_strategy.cc', - 'client/plugin/pepper_signal_strategy.h', + 'client/plugin/pepper_view.cc', + 'client/plugin/pepper_view.h', + ], + 'conditions' : [ + [ '(OS!="linux" or chromeos==0)', { + 'sources!': [ + 'client/plugin/normalizing_input_filter_cros.cc', + ], + }], ], }, # end of target 'remoting_client_plugin' @@ -2228,7 +2231,7 @@ 'target_conditions': [ # We cannot currently build the appsv2 version of WebApp on Windows as # there isn't a version of the "patch" tool available on windows. We - # should remove this condition when we remove the reliance on the 'patch'. + # should remove this condition when we remove the reliance on patch. # We define this in a 'target_conditions' section because 'plugin_path' # is defined in a 'conditions' section so its value is not available @@ -2293,42 +2296,55 @@ ], 'variables': { 'input': 'host/setup/native_messaging_manifest.json', - 'output': '<(PRODUCT_DIR)/remoting/native_messaging_manifest.json', + 'output': '<(PRODUCT_DIR)/remoting/com.google.chrome.remote_desktop.json', }, - 'conditions': [ - [ 'OS=="win"', { - 'variables': { - 'native_messaging_host_path': 'remoting_host.exe', - }, - }, { - 'variables': { - 'native_messaging_host_path': '/opt/google/chrome-remote-desktop/native-messaging-host', - }, - }], - ], - 'actions': [ - { - 'action_name': 'generate_manifest', - 'inputs': [ - '<(remoting_localize_path)', - '<(input)', - ], - 'outputs': [ - '<(output)', - ], - 'action': [ - 'python', - '<(remoting_localize_path)', - '--define', 'NATIVE_MESSAGING_HOST_PATH=<(native_messaging_host_path)', - '--locale_dir', '<(webapp_locale_dir)', - '--template', '<(input)', - '--locale_output', - '<(output)', - '--encoding', 'utf-8', - 'en', - ], + 'target_conditions': [ + ['OS == "win" or OS == "mac" or OS == "linux"', { + 'conditions': [ + [ 'OS == "win"', { + 'variables': { + 'native_messaging_host_path': 'remoting_host.exe', + }, + }], [ 'OS == "mac"', { + 'variables': { + 'native_messaging_host_path': '/Library/PrivilegedHelperTools/org.chromium.chromoting.me2me_host.app/Contents/MacOS/native_messaging_host', + }, + }], ['OS == "linux"', { + 'variables': { + 'native_messaging_host_path': '/opt/google/chrome-remote-desktop/native-messaging-host', + }, + }], ['OS != "linux" and OS != "mac" and OS != "win"', { + 'variables': { + 'native_messaging_host_path': '/opt/google/chrome-remote-desktop/native-messaging-host', + }, + }], + ], # conditions + 'actions': [ + { + 'action_name': 'generate_manifest', + 'inputs': [ + '<(remoting_localize_path)', + '<(input)', + ], + 'outputs': [ + '<(output)', + ], + 'action': [ + 'python', + '<(remoting_localize_path)', + '--define', 'NATIVE_MESSAGING_HOST_PATH=<(native_messaging_host_path)', + '--locale_dir', '<(webapp_locale_dir)', + '--template', '<(input)', + '--locale_output', + '<(output)', + '--encoding', 'utf-8', + 'en', + ], + }, + ], # actions }, - ], + ], + ], # target_conditions }, # end of target 'remoting_native_messaging_manifest' { 'target_name': 'remoting_resources', @@ -2346,6 +2362,7 @@ 'host/win/core.rc.jinja2', 'host/win/host_messages.mc.jinja2', 'host/win/version.rc.jinja2', + 'webapp/background.js', 'webapp/butter_bar.js', 'webapp/client_screen.js', 'webapp/error.js', @@ -2423,7 +2440,6 @@ '../third_party/libyuv/libyuv.gyp:libyuv', '../third_party/opus/opus.gyp:opus', '../third_party/protobuf/protobuf.gyp:protobuf_lite', - '../third_party/speex/speex.gyp:libspeex', '../media/media.gyp:media', '../media/media.gyp:shared_memory_support', 'remoting_jingle_glue', @@ -2480,15 +2496,11 @@ 'codec/audio_decoder.h', 'codec/audio_decoder_opus.cc', 'codec/audio_decoder_opus.h', - 'codec/audio_decoder_speex.cc', - 'codec/audio_decoder_speex.h', 'codec/audio_decoder_verbatim.cc', 'codec/audio_decoder_verbatim.h', 'codec/audio_encoder.h', 'codec/audio_encoder_opus.cc', 'codec/audio_encoder_opus.h', - 'codec/audio_encoder_speex.cc', - 'codec/audio_encoder_speex.h', 'codec/audio_encoder_verbatim.cc', 'codec/audio_encoder_verbatim.h', 'codec/video_decoder.h', @@ -2760,7 +2772,8 @@ 'base/util_unittest.cc', 'client/audio_player_unittest.cc', 'client/key_event_mapper_unittest.cc', - 'client/plugin/mac_key_event_processor_unittest.cc', + 'client/plugin/normalizing_input_filter_cros_unittest.cc', + 'client/plugin/normalizing_input_filter_mac_unittest.cc', 'codec/audio_encoder_opus_unittest.cc', 'codec/codec_test.cc', 'codec/codec_test.h', @@ -2873,7 +2886,7 @@ ], }, }], - ['OS=="mac" or (OS=="linux" and chromeos==0)', { + [ 'OS=="mac" or (OS=="linux" and chromeos==0)', { # Javascript unittests are disabled on CrOS because they cause # valgrind and test errors. # @@ -2907,6 +2920,11 @@ '<@(remoting_webapp_js_files)', ], }], + [ '(OS!="linux" or chromeos==0)', { + 'sources!': [ + 'client/plugin/normalizing_input_filter_cros_unittest.cc', + ], + }], ['enable_remoting_host == 0', { 'dependencies!': [ 'remoting_host', |