From 6ec7b8da05d21a3878bd21c691b41e675d74bb1c Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Mon, 17 Jul 2017 13:57:45 +0200 Subject: BASELINE: Update Chromium to 60.0.3112.70 Change-Id: I9911c2280a014d4632f254857876a395d4baed2d Reviewed-by: Alexandru Croitor --- chromium/remoting/BUILD.gn | 4 +- chromium/remoting/base/BUILD.gn | 1 - chromium/remoting/client/BUILD.gn | 15 ++- chromium/remoting/client/display/BUILD.gn | 7 +- chromium/remoting/client/input/BUILD.gn | 57 +++++++++++ chromium/remoting/client/ios/BUILD.gn | 90 ----------------- chromium/remoting/client/ios/app/BUILD.gn | 106 -------------------- .../remoting/client/ios/app/resources/BUILD.gn | 74 -------------- chromium/remoting/client/ios/bridge/BUILD.gn | 93 ------------------ chromium/remoting/client/ios/display/BUILD.gn | 45 --------- chromium/remoting/client/ios/domain/BUILD.gn | 18 ---- chromium/remoting/client/ios/facade/BUILD.gn | 26 ----- chromium/remoting/client/ios/session/BUILD.gn | 24 ----- chromium/remoting/client/jni/BUILD.gn | 1 - chromium/remoting/client/ui/BUILD.gn | 55 +++++++++++ chromium/remoting/host/BUILD.gn | 109 +++++++-------------- chromium/remoting/host/chromeos/BUILD.gn | 61 ++++++++++++ chromium/remoting/host/it2me/BUILD.gn | 17 ++-- chromium/remoting/host/linux/BUILD.gn | 49 ++++++++- chromium/remoting/host/mac/BUILD.gn | 4 +- chromium/remoting/host/win/BUILD.gn | 4 + chromium/remoting/ios/BUILD.gn | 86 ++++++++++++++++ chromium/remoting/ios/app/BUILD.gn | 109 +++++++++++++++++++++ chromium/remoting/ios/app/resources/BUILD.gn | 74 ++++++++++++++ chromium/remoting/ios/display/BUILD.gn | 47 +++++++++ chromium/remoting/ios/domain/BUILD.gn | 20 ++++ chromium/remoting/ios/facade/BUILD.gn | 30 ++++++ chromium/remoting/ios/session/BUILD.gn | 28 ++++++ chromium/remoting/proto/BUILD.gn | 1 + chromium/remoting/protocol/BUILD.gn | 1 + chromium/remoting/remoting_enable.gni | 2 +- chromium/remoting/remoting_locales.gni | 36 ++++--- chromium/remoting/resources/BUILD.gn | 11 ++- chromium/remoting/test/BUILD.gn | 5 +- .../tools/javascript_key_tester/pnacl/BUILD.gn | 2 +- chromium/remoting/webapp/build_template.gni | 2 +- chromium/remoting/webapp/files.gni | 2 +- 37 files changed, 720 insertions(+), 596 deletions(-) create mode 100644 chromium/remoting/client/input/BUILD.gn delete mode 100644 chromium/remoting/client/ios/BUILD.gn delete mode 100644 chromium/remoting/client/ios/app/BUILD.gn delete mode 100644 chromium/remoting/client/ios/app/resources/BUILD.gn delete mode 100644 chromium/remoting/client/ios/bridge/BUILD.gn delete mode 100644 chromium/remoting/client/ios/display/BUILD.gn delete mode 100644 chromium/remoting/client/ios/domain/BUILD.gn delete mode 100644 chromium/remoting/client/ios/facade/BUILD.gn delete mode 100644 chromium/remoting/client/ios/session/BUILD.gn create mode 100644 chromium/remoting/client/ui/BUILD.gn create mode 100644 chromium/remoting/host/chromeos/BUILD.gn create mode 100644 chromium/remoting/ios/BUILD.gn create mode 100644 chromium/remoting/ios/app/BUILD.gn create mode 100644 chromium/remoting/ios/app/resources/BUILD.gn create mode 100644 chromium/remoting/ios/display/BUILD.gn create mode 100644 chromium/remoting/ios/domain/BUILD.gn create mode 100644 chromium/remoting/ios/facade/BUILD.gn create mode 100644 chromium/remoting/ios/session/BUILD.gn (limited to 'chromium/remoting') diff --git a/chromium/remoting/BUILD.gn b/chromium/remoting/BUILD.gn index d2b0db8c67d..3f64988626f 100644 --- a/chromium/remoting/BUILD.gn +++ b/chromium/remoting/BUILD.gn @@ -38,7 +38,7 @@ group("remoting_all") { } if (is_ios) { - deps += [ "//remoting/client/ios:all" ] + deps += [ "//remoting/ios:all" ] } if (enable_remoting_host) { @@ -154,6 +154,8 @@ test("remoting_unittests") { "//remoting/base:unit_tests", "//remoting/client:unit_tests", "//remoting/client/display:unit_tests", + "//remoting/client/input:unit_tests", + "//remoting/client/ui:unit_tests", "//remoting/protocol:unit_tests", "//remoting/signaling:unit_tests", "//remoting/test:unit_tests", diff --git a/chromium/remoting/base/BUILD.gn b/chromium/remoting/base/BUILD.gn index 8736da9b21c..ec25bfaa751 100644 --- a/chromium/remoting/base/BUILD.gn +++ b/chromium/remoting/base/BUILD.gn @@ -108,7 +108,6 @@ source_set("breakpad") { sources = [ "breakpad.h", "breakpad_linux.cc", - "breakpad_linux.h", "breakpad_mac.mm", "breakpad_win.cc", ] diff --git a/chromium/remoting/client/BUILD.gn b/chromium/remoting/client/BUILD.gn index 4ad8bb3c2ab..6a966b040ae 100644 --- a/chromium/remoting/client/BUILD.gn +++ b/chromium/remoting/client/BUILD.gn @@ -8,7 +8,6 @@ static_library("client") { set_sources_assignment_filter([]) sources = [ - "audio_consumer.h", "audio_player.cc", "audio_player.h", "chromoting_client.cc", @@ -32,8 +31,6 @@ static_library("client") { "host_experiment_sender.h", "key_event_mapper.cc", "key_event_mapper.h", - "native_device_keymap.cc", - "native_device_keymap.h", "normalizing_input_filter_cros.cc", "normalizing_input_filter_cros.h", "normalizing_input_filter_mac.cc", @@ -46,8 +43,6 @@ static_library("client") { "server_log_entry_client.h", "software_video_renderer.cc", "software_video_renderer.h", - "touch_input_scaler.cc", - "touch_input_scaler.h", ] set_sources_assignment_filter(sources_assignment_filter) @@ -59,6 +54,7 @@ static_library("client") { deps = [ "//remoting/base", + "//remoting/client/input", "//remoting/codec:decoder", "//remoting/protocol", "//third_party/libyuv", @@ -77,15 +73,19 @@ static_library("client") { sources += [ "chromoting_client_runtime.cc", "chromoting_client_runtime.h", + "gesture_interpreter.cc", + "gesture_interpreter.h", + ] + deps += [ + "//remoting/client/display", + "//remoting/client/ui", ] } if (is_android) { sources += [ "audio_player_android.cc", "audio_player_android.h", - "native_device_keymap_android.cc", ] - sources -= [ "native_device_keymap.cc" ] libs += [ "android", "OpenSLES", @@ -112,7 +112,6 @@ source_set("unit_tests") { "queued_task_poster_unittest.cc", "server_log_entry_client_unittest.cc", "software_video_renderer_unittest.cc", - "touch_input_scaler_unittest.cc", ] set_sources_assignment_filter(sources_assignment_filter) diff --git a/chromium/remoting/client/display/BUILD.gn b/chromium/remoting/client/display/BUILD.gn index c2d5007bbe3..fd8fbf0bf47 100644 --- a/chromium/remoting/client/display/BUILD.gn +++ b/chromium/remoting/client/display/BUILD.gn @@ -24,12 +24,17 @@ source_set("display") { "gl_render_layer.h", "gl_renderer.cc", "gl_renderer.h", + "renderer_proxy.cc", + "renderer_proxy.h", "sys_opengl.h", ] - deps = [ + public_deps = [ "//remoting/proto", + ] + deps = [ "//third_party/libyuv", + "//third_party/protobuf:protobuf_lite", "//third_party/webrtc/base:rtc_base_approved", ] diff --git a/chromium/remoting/client/input/BUILD.gn b/chromium/remoting/client/input/BUILD.gn new file mode 100644 index 00000000000..8e7cda55b21 --- /dev/null +++ b/chromium/remoting/client/input/BUILD.gn @@ -0,0 +1,57 @@ +# Copyright 2014 The Chromium Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +source_set("input") { + sources = [ + "client_input_injector.h", + "direct_input_strategy.cc", + "direct_input_strategy.h", + "input_strategy.h", + "keyboard_input_strategy.h", + "keyboard_interpreter.cc", + "keyboard_interpreter.h", + "native_device_keymap.cc", + "native_device_keymap.h", + "native_device_keymap_android.cc", + "native_device_keymap_ios.cc", + "text_keyboard_input_strategy.cc", + "text_keyboard_input_strategy.h", + "touch_input_scaler.cc", + "touch_input_scaler.h", + "trackpad_input_strategy.cc", + "trackpad_input_strategy.h", + ] + + deps = [ + "//remoting/base", + "//remoting/client/ui:ui_manipulation", + "//third_party/webrtc/base:rtc_base_approved", + "//ui/events:dom_keycode_converter", + ] + + if (is_android || is_ios) { + sources -= [ "native_device_keymap.cc" ] + } +} + +source_set("unit_tests") { + testonly = true + + sources = [ + "touch_input_scaler_unittest.cc", + ] + + configs += [ + "//remoting/build/config:version", + "//remoting/build/config:enable_webrtc_remoting_client", + ] + + deps = [ + ":input", + "//remoting/proto", + "//testing/gmock", + "//testing/gtest", + "//third_party/webrtc/base:rtc_base_approved", + ] +} diff --git a/chromium/remoting/client/ios/BUILD.gn b/chromium/remoting/client/ios/BUILD.gn deleted file mode 100644 index 55b1894b174..00000000000 --- a/chromium/remoting/client/ios/BUILD.gn +++ /dev/null @@ -1,90 +0,0 @@ -# Copyright 2016 The Chromium Authors. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -import("//remoting/build/config/remoting_build.gni") - -group("all") { - testonly = true - - deps = [ - ":ios_core", - "./app:all", - "./bridge:all", - ] -} - -group("all_test") { - testonly = true - - deps = [ - ":ios_core_unit_tests", - "./bridge:bridge_unit_tests", - ] -} - -source_set("ios_core") { - sources = [ - "client_gestures.h", - "client_gestures.mm", - "host_preferences.h", - "host_preferences.mm", - "host_preferences_persistence.h", - "key_input.h", - "key_input.mm", - "key_map_us.h", - "utility.h", - "utility.mm", - ] - - if (!is_chrome_branded) { - sources += [ "host_preferences_persistence_chromium.mm" ] - } else { - # TODO(nicholss): Until we have a private implementation of this, stub it - # with the chromium version. We still want the logic of is_chrome_branded - # but to get the release builds building we will just reuse the file. - sources += [ "host_preferences_persistence_chromium.mm" ] - } - - public_deps = [ - "//remoting/client/ios/domain", - "//remoting/client/ios/facade", - "//third_party/webrtc/base:rtc_base", - "//third_party/webrtc/modules/desktop_capture:primitives", - ] - - deps = [ - "//base", - "//remoting/protocol", - ] - - libs = [ - "CoreGraphics.framework", - "GLKit.framework", - "OpenGLES.framework", - ] - - configs += [ "//build/config/compiler:enable_arc" ] -} - -source_set("ios_core_unit_tests") { - testonly = true - - include_dirs = [ - "$root_gen_dir", - "//third_party/protobuf/src", - ] - - sources = [ - "key_input_unittest.mm", - ] - - deps = [ - ":ios_core", - "//testing/gtest", - ] - - configs += [ "//build/config/compiler:enable_arc" ] - - data = [] -} diff --git a/chromium/remoting/client/ios/app/BUILD.gn b/chromium/remoting/client/ios/app/BUILD.gn deleted file mode 100644 index f775b25b1c5..00000000000 --- a/chromium/remoting/client/ios/app/BUILD.gn +++ /dev/null @@ -1,106 +0,0 @@ -# Copyright 2017 The Chromium Authors. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -import("//build/config/chrome_build.gni") -import("//build/config/ios/rules.gni") -import("//build/mac/tweak_info_plist.gni") -import("//build/util/process_version.gni") -import("//remoting/build/config/remoting_build.gni") - -group("all") { - testonly = true - - deps = [ - ":ios_remoting_app", - ] -} - -source_set("main") { - sources = [ - "app_delegate.h", - "app_delegate.mm", - "host_collection_view_cell.h", - "host_collection_view_cell.mm", - "host_collection_view_controller.h", - "host_collection_view_controller.mm", - "host_view_controller.h", - "host_view_controller.mm", - "main.mm", - "pin_entry_view_controller.h", - "pin_entry_view_controller.mm", - "remoting_settings_view_controller.h", - "remoting_settings_view_controller.mm", - "remoting_view_controller.h", - "remoting_view_controller.mm", - ] - - deps = [ - "//base", - "//google_apis", - "//remoting/base", - "//remoting/client", - "//remoting/client/ios:ios_core", - "//remoting/protocol", - "//ui/base", - "//ui/gfx", - "//ui/resources", - ] - - public_deps = [ - "//ios/third_party/material_components_ios", - ] - - configs += [ "//build/config/compiler:enable_arc" ] -} - -tweak_info_plist("tweak_info_plist") { - info_plist = "//remoting/client/ios/app/resources/Info.plist" - args = [ "--platform=ios" ] -} - -ios_app_bundle("ios_remoting_app") { - output_name = "remoting-ios" - - entitlements_path = "resources/Remoting.entitlements" - info_plist_target = ":tweak_info_plist" - - extra_substitutions = [ - "BUNDLE_IDENTIFIER=$remoting_ios_bundle_id", - "DISPLAY_NAME=$remoting_ios_display_name", - "EXECUTABLE_NAME=$remoting_ios_executable_name", - "MINIMUM_OS_VERSION=7.0", - "PRODUCT_NAME=$remoting_ios_product_name", - "VERSION_FULL=$remoting_version_full", - "VERSION_SHORT=$remoting_version_short", - ] - - libs = [ - "Accelerate.framework", - "AudioToolbox.framework", - "CoreAudio.framework", - "CoreData.framework", - "CoreMIDI.framework", - "CoreVideo.framework", - "GLKit.framework", - "OpenGLES.framework", - "Webkit.framework", - "SafariServices.framework", - "SystemConfiguration.framework", - ] - - deps = [ - ":main", - "//base", - "//remoting/client/ios/app/resources:assets", - "//remoting/client/ios/app/resources:launchscreen_assets", - "//remoting/client/ios/app/resources:remoting_icons", - "//remoting/client/ios/display", - ] - - bundle_deps = [ ":launchscreen_storyboard" ] -} - -bundle_data_ib_file("launchscreen_storyboard") { - source = "resources/LaunchScreen.storyboard" -} diff --git a/chromium/remoting/client/ios/app/resources/BUILD.gn b/chromium/remoting/client/ios/app/resources/BUILD.gn deleted file mode 100644 index 5f15eb31c95..00000000000 --- a/chromium/remoting/client/ios/app/resources/BUILD.gn +++ /dev/null @@ -1,74 +0,0 @@ -# Copyright 2017 The Chromium Authors. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -import("//build/config/chrome_build.gni") -import("//build/config/ios/rules.gni") -import("//remoting/build/config/remoting_build.gni") - -bundle_data("assets") { - sources = [ - "Assets.xcassets/ic_desktop.imageset/Contents.json", - "Assets.xcassets/ic_desktop.imageset/ic_desktop.png", - "Assets.xcassets/ic_desktop.imageset/ic_desktop@2x.png", - "Assets.xcassets/ic_desktop.imageset/ic_desktop@3x.png", - "Assets.xcassets/ic_desktop_windows.imageset/Contents.json", - "Assets.xcassets/ic_desktop_windows.imageset/ic_desktop_windows.png", - "Assets.xcassets/ic_desktop_windows.imageset/ic_desktop_windows@2x.png", - "Assets.xcassets/ic_desktop_windows.imageset/ic_desktop_windows@3x.png", - "Assets.xcassets/ic_fullscreen.imageset/Contents.json", - "Assets.xcassets/ic_fullscreen.imageset/ic_fullscreen.png", - "Assets.xcassets/ic_fullscreen.imageset/ic_fullscreen@2x.png", - "Assets.xcassets/ic_fullscreen.imageset/ic_fullscreen@3x.png", - "Assets.xcassets/ic_fullscreen_exit.imageset/Contents.json", - "Assets.xcassets/ic_fullscreen_exit.imageset/ic_fullscreen_exit.png", - "Assets.xcassets/ic_fullscreen_exit.imageset/ic_fullscreen_exit@2x.png", - "Assets.xcassets/ic_fullscreen_exit.imageset/ic_fullscreen_exit@3x.png", - "Assets.xcassets/ic_mouse.imageset/Contents.json", - "Assets.xcassets/ic_mouse.imageset/ic_mouse.png", - "Assets.xcassets/ic_mouse.imageset/ic_mouse@2x.png", - "Assets.xcassets/ic_mouse.imageset/ic_mouse@3x.png", - "Assets.xcassets/ic_touch_app.imageset/Contents.json", - "Assets.xcassets/ic_touch_app.imageset/ic_touch_app.png", - "Assets.xcassets/ic_touch_app.imageset/ic_touch_app_2x.png", - "Assets.xcassets/ic_touch_app.imageset/ic_touch_app_3x.png", - ] - outputs = [ - "{{bundle_resources_dir}}/{{source_file_part}}", - ] -} - -bundle_data("launchscreen_assets") { - sources = [ - "launchscreen_images.xcassets/Contents.json", - "launchscreen_images.xcassets/launchscreen_app_logo.imageset/Contents.json", - "launchscreen_images.xcassets/launchscreen_app_logo.imageset/launchscreen_app_logo.png", - "launchscreen_images.xcassets/launchscreen_app_logo.imageset/launchscreen_app_logo@2x.png", - "launchscreen_images.xcassets/launchscreen_app_logo.imageset/launchscreen_app_logo@3x.png", - "launchscreen_images.xcassets/launchscreen_brand_name.imageset/Contents.json", - "launchscreen_images.xcassets/launchscreen_brand_name.imageset/launchscreen_brand_name.png", - "launchscreen_images.xcassets/launchscreen_brand_name.imageset/launchscreen_brand_name@2x.png", - "launchscreen_images.xcassets/launchscreen_brand_name.imageset/launchscreen_brand_name@3x.png", - ] - outputs = [ - "{{bundle_resources_dir}}/{{source_file_part}}", - ] -} - -bundle_data("remoting_icons") { - sources = [ - "chromium/Icon-120.png", - "chromium/Icon-152.png", - "chromium/Icon-167.png", - "chromium/Icon-180.png", - "chromium/Icon-29.png", - "chromium/Icon-40.png", - "chromium/Icon-58.png", - "chromium/Icon-76.png", - "chromium/Icon-80.png", - "chromium/Icon-87.png", - ] - outputs = [ - "{{bundle_resources_dir}}/{{source_file_part}}", - ] -} diff --git a/chromium/remoting/client/ios/bridge/BUILD.gn b/chromium/remoting/client/ios/bridge/BUILD.gn deleted file mode 100644 index bc4c658bb67..00000000000 --- a/chromium/remoting/client/ios/bridge/BUILD.gn +++ /dev/null @@ -1,93 +0,0 @@ -# Copyright 2016 The Chromium Authors. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -import("//build/config/ios/rules.gni") - -group("all") { - testonly = true - - deps = [ - ":bridge", - ":bridge_unit_tests", - ] -} - -source_set("bridge") { - include_dirs = [ - "$root_gen_dir", - "//third_party/protobuf/src", - ] - - sources = [ - "client_instance.cc", - "client_instance.h", - "client_proxy.h", - "client_proxy.mm", - "client_proxy_delegate.h", - "client_proxy_delegate_wrapper.h", - "client_proxy_delegate_wrapper.mm", - "frame_consumer_bridge.cc", - "frame_consumer_bridge.h", - "host_proxy.h", - "host_proxy.mm", - ] - - public_deps = [ - "//remoting/protocol", - "//third_party/webrtc/base:rtc_base", - "//third_party/webrtc/modules/desktop_capture:primitives", - ] - - deps = [ - "//base", - "//net", - "//remoting/client/ios:ios_core", - "//remoting/resources:strings", - "//ui/base", - "//ui/gfx", - "//ui/resources", - "//ui/strings:ui_strings", - ] - - libs = [ - "Accelerate.framework", - "AudioToolbox.framework", - "CoreAudio.framework", - "CoreData.framework", - "CoreMIDI.framework", - "CoreVideo.framework", - "CoreGraphics.framework", - "GLKit.framework", - "OpenGLES.framework", - "Webkit.framework", - ] - - configs += [ "//build/config/compiler:enable_arc" ] -} - -source_set("bridge_unit_tests") { - testonly = true - - include_dirs = [ - "$root_gen_dir", - "//third_party/protobuf/src", - ] - - sources = [ - "client_instance_unittest.mm", - "client_proxy_unittest.mm", - - # "frame_consumer_bridge_unittest.cc", - "host_proxy_unittest.mm", - ] - - deps = [ - ":bridge", - "//testing/gtest", - ] - - configs += [ "//build/config/compiler:enable_arc" ] - - data = [] -} diff --git a/chromium/remoting/client/ios/display/BUILD.gn b/chromium/remoting/client/ios/display/BUILD.gn deleted file mode 100644 index 548667d81a5..00000000000 --- a/chromium/remoting/client/ios/display/BUILD.gn +++ /dev/null @@ -1,45 +0,0 @@ -# Copyright 2017 The Chromium Authors. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -group("all") { - testonly = true - - deps = [ - ":display", - ] -} - -group("all_test") { - testonly = true - - deps = [] -} - -source_set("display") { - sources = [ - "gl_demo_screen.h", - "gl_demo_screen.mm", - "gl_display_handler.h", - "gl_display_handler.mm", - ] - - public_deps = [ - "//remoting/client", - "//remoting/client/display", - "//remoting/client/ios/bridge", - "//third_party/webrtc/base:rtc_base_approved", - ] - - deps = [ - "//base", - ] - - libs = [ - "CoreGraphics.framework", - "GLKit.framework", - "OpenGLES.framework", - ] - - configs += [ "//build/config/compiler:enable_arc" ] -} diff --git a/chromium/remoting/client/ios/domain/BUILD.gn b/chromium/remoting/client/ios/domain/BUILD.gn deleted file mode 100644 index 7d3dd2f24c3..00000000000 --- a/chromium/remoting/client/ios/domain/BUILD.gn +++ /dev/null @@ -1,18 +0,0 @@ -# Copyright 2017 The Chromium Authors. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -import("//build/config/chrome_build.gni") -import("//build/config/ios/rules.gni") -import("//remoting/build/config/remoting_build.gni") - -source_set("domain") { - sources = [ - "host_info.h", - "host_info.mm", - "user_info.h", - "user_info.mm", - ] - - configs += [ "//build/config/compiler:enable_arc" ] -} diff --git a/chromium/remoting/client/ios/facade/BUILD.gn b/chromium/remoting/client/ios/facade/BUILD.gn deleted file mode 100644 index 8bdcbff4376..00000000000 --- a/chromium/remoting/client/ios/facade/BUILD.gn +++ /dev/null @@ -1,26 +0,0 @@ -# Copyright 2017 The Chromium Authors. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -import("//build/config/chrome_build.gni") -import("//build/config/ios/rules.gni") -import("//remoting/build/config/remoting_build.gni") - -source_set("facade") { - sources = [ - "host_info.cc", - "host_info.h", - "host_list_fetcher.cc", - "host_list_fetcher.h", - "remoting_service.h", - "remoting_service.mm", - ] - - deps = [ - "//base", - "//remoting/base:authorization", - "//remoting/client/ios/domain", - ] - - configs += [ "//build/config/compiler:enable_arc" ] -} diff --git a/chromium/remoting/client/ios/session/BUILD.gn b/chromium/remoting/client/ios/session/BUILD.gn deleted file mode 100644 index 843a023b6bd..00000000000 --- a/chromium/remoting/client/ios/session/BUILD.gn +++ /dev/null @@ -1,24 +0,0 @@ -# Copyright 2017 The Chromium Authors. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -import("//build/config/chrome_build.gni") -import("//build/config/ios/rules.gni") -import("//remoting/build/config/remoting_build.gni") - -source_set("session") { - sources = [ - "remoting_client.h", - "remoting_client.mm", - "remoting_client_session_delegate.h", - "remoting_client_session_delegate.mm", - ] - - deps = [ - "//base", - "//remoting/client", - "//remoting/client/ios/domain", - ] - - configs += [ "//build/config/compiler:enable_arc" ] -} diff --git a/chromium/remoting/client/jni/BUILD.gn b/chromium/remoting/client/jni/BUILD.gn index b7eeb55a933..f0f80828ac7 100644 --- a/chromium/remoting/client/jni/BUILD.gn +++ b/chromium/remoting/client/jni/BUILD.gn @@ -26,7 +26,6 @@ shared_library("remoting_client_jni") { "//ui/gfx", ] sources = [ - "display_updater_factory.h", "egl_thread_context.cc", "egl_thread_context.h", "jni_client.cc", diff --git a/chromium/remoting/client/ui/BUILD.gn b/chromium/remoting/client/ui/BUILD.gn new file mode 100644 index 00000000000..25b31066319 --- /dev/null +++ b/chromium/remoting/client/ui/BUILD.gn @@ -0,0 +1,55 @@ +# Copyright 2017 The Chromium Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +source_set("ui") { + sources = [ + "fling_animation.cc", + "fling_animation.h", + "fling_tracker.cc", + "fling_tracker.h", + ] + + deps = [ + ":ui_manipulation", + "//remoting/client/display", + ] + + public_deps = [ + "//remoting/proto", + "//third_party/webrtc/base:rtc_base_approved", + ] +} + +source_set("ui_manipulation") { + sources = [ + "desktop_viewport.cc", + "desktop_viewport.h", + "view_matrix.cc", + "view_matrix.h", + ] + + deps = [] + + public_deps = [ + "//remoting/proto", + "//third_party/webrtc/base:rtc_base_approved", + ] +} + +source_set("unit_tests") { + testonly = true + + sources = [ + "desktop_viewport_unittest.cc", + "fling_animation_unittest.cc", + ] + + configs += [ "//remoting/build/config:version" ] + + deps = [ + ":ui", + "//testing/gmock", + "//testing/gtest", + ] +} diff --git a/chromium/remoting/host/BUILD.gn b/chromium/remoting/host/BUILD.gn index cb35bfe4e52..a699cc7e78a 100644 --- a/chromium/remoting/host/BUILD.gn +++ b/chromium/remoting/host/BUILD.gn @@ -57,6 +57,7 @@ static_library("host") { sources = [ "audio_capturer.cc", "audio_capturer.h", + "audio_capturer_chromeos.cc", "audio_capturer_linux.cc", "audio_capturer_linux.h", "audio_capturer_mac.cc", @@ -64,24 +65,14 @@ static_library("host") { "audio_capturer_win.h", "audio_silence_detector.cc", "audio_silence_detector.h", + "audio_volume_filter.cc", + "audio_volume_filter.h", "backoff_timer.cc", "backoff_timer.h", "basic_desktop_environment.cc", "basic_desktop_environment.h", "branding.cc", "branding.h", - "chromeos/aura_desktop_capturer.cc", - "chromeos/aura_desktop_capturer.h", - "chromeos/clipboard_aura.cc", - "chromeos/clipboard_aura.h", - "chromeos/message_box.cc", - "chromeos/message_box.h", - "chromeos/mouse_cursor_monitor_aura.cc", - "chromeos/mouse_cursor_monitor_aura.h", - "chromeos/point_transformer.cc", - "chromeos/point_transformer.h", - "chromeos/skia_bitmap_desktop_frame.cc", - "chromeos/skia_bitmap_desktop_frame.h", "chromoting_host.cc", "chromoting_host.h", "chromoting_host_context.cc", @@ -107,6 +98,8 @@ static_library("host") { "continue_window_linux.cc", "continue_window_mac.mm", "continue_window_win.cc", + "current_process_stats_agent.cc", + "current_process_stats_agent.h", "curtain_mode.h", "curtain_mode_linux.cc", "curtain_mode_mac.cc", @@ -142,6 +135,8 @@ static_library("host") { "disconnect_window_win.cc", "dns_blackhole_checker.cc", "dns_blackhole_checker.h", + "forward_process_stats_agent.cc", + "forward_process_stats_agent.h", "gcd_rest_client.cc", "gcd_rest_client.h", "gcd_state_updater.cc", @@ -206,20 +201,6 @@ static_library("host") { "ipc_video_frame_capturer.h", "it2me_desktop_environment.cc", "it2me_desktop_environment.h", - "linux/audio_pipe_reader.cc", - "linux/audio_pipe_reader.h", - "linux/certificate_watcher.cc", - "linux/certificate_watcher.h", - "linux/unicode_to_keysym.cc", - "linux/unicode_to_keysym.h", - "linux/x11_character_injector.cc", - "linux/x11_character_injector.h", - "linux/x11_keyboard_impl.cc", - "linux/x11_keyboard_impl.h", - "linux/x11_util.cc", - "linux/x11_util.h", - "linux/x_server_clipboard.cc", - "linux/x_server_clipboard.h", "local_input_monitor.h", "local_input_monitor_chromeos.cc", "local_input_monitor_mac.mm", @@ -248,6 +229,11 @@ static_library("host") { "policy_watcher.h", "posix/signal_handler.cc", "posix/signal_handler.h", + "process_stats_agent.h", + "process_stats_sender.cc", + "process_stats_sender.h", + "process_stats_util.cc", + "process_stats_util.h", "register_support_host_request.cc", "register_support_host_request.h", "remote_input_filter.cc", @@ -326,6 +312,7 @@ static_library("host") { } if (is_linux && !is_chromeos) { + public_deps += [ "//remoting/host/linux" ] libs += [ "pam" ] } @@ -334,6 +321,7 @@ static_library("host") { "//build/config/linux:x11", "//build/config/linux:xrandr", ] + deps += [ "//remoting/host/linux:x11" ] if (is_desktop_linux) { deps += [ "//build/config/linux/gtk" ] } @@ -344,17 +332,6 @@ static_library("host") { "input_injector_x11.cc", "local_input_monitor_x11.cc", ] - if (is_linux) { - # These will already be filtered out on non-Linux. - sources -= [ - "linux/unicode_to_keysym.cc", - "linux/x11_keyboard_impl.cc", - "linux/x11_keyboard_impl.h", - "linux/x11_util.cc", - "linux/x_server_clipboard.cc", - "linux/x_server_clipboard.h", - ] - } } if (!use_ozone) { @@ -365,19 +342,15 @@ static_library("host") { # TODO(GYP): crbug.com/481627. These should only be included # when enable_me2me_host is true. sources -= [ + "audio_capturer_linux.cc", + "audio_capturer_linux.h", + "continue_window_linux.cc", + "curtain_mode_linux.cc", + "disconnect_window_linux.cc", "me2me_desktop_environment.cc", "me2me_desktop_environment.h", ] - deps += [ - "//cc", - "//gpu/command_buffer/common", - "//ppapi/host", - "//skia", - "//ui/aura", - "//ui/compositor", - "//ui/events", - "//ui/views", - ] + deps += [ "//remoting/host/chromeos" ] if (use_ash) { deps += [ "//ash" ] @@ -392,17 +365,9 @@ static_library("host") { "desktop_resizer_x11.cc", "input_injector_chromeos.cc", "input_injector_chromeos.h", - "linux/x_server_clipboard.cc", - "linux/x_server_clipboard.h", "local_input_monitor_x11.cc", ] } - - sources -= [ - "continue_window_linux.cc", - "curtain_mode_linux.cc", - "disconnect_window_linux.cc", - ] } if (is_mac) { @@ -411,9 +376,6 @@ static_library("host") { "Carbon.framework", ] - # TODO(nicholss): When we can delete GYP builds, - # this flag and usage can be removed. - defines += [ "GN_BUILD=1" ] deps += [ ":remoting_version", "//third_party/google_toolbox_for_mac", @@ -478,9 +440,8 @@ source_set("unit_tests") { sources = [ "audio_silence_detector_unittest.cc", + "audio_volume_filter_unittest.cc", "backoff_timer_unittest.cc", - "chromeos/aura_desktop_capturer_unittest.cc", - "chromeos/clipboard_aura_unittest.cc", "chromoting_host_context_unittest.cc", "chromoting_host_unittest.cc", "client_session_unittest.cc", @@ -502,11 +463,6 @@ source_set("unit_tests") { "it2me/it2me_confirmation_dialog_proxy_unittest.cc", "it2me/it2me_host_unittest.cc", "it2me/it2me_native_messaging_host_unittest.cc", - "linux/audio_pipe_reader_unittest.cc", - "linux/certificate_watcher_unittest.cc", - "linux/unicode_to_keysym_unittest.cc", - "linux/x11_character_injector_unittest.cc", - "linux/x_server_clipboard_unittest.cc", "local_input_monitor_unittest.cc", "mouse_cursor_monitor_proxy_unittest.cc", "mouse_shape_pump_unittest.cc", @@ -516,6 +472,7 @@ source_set("unit_tests") { "pairing_registry_delegate_win_unittest.cc", "pin_hash_unittest.cc", "policy_watcher_unittest.cc", + "process_stats_sender_unittest.cc", "register_support_host_request_unittest.cc", "remote_input_filter_unittest.cc", "resizing_host_observer_unittest.cc", @@ -530,15 +487,9 @@ source_set("unit_tests") { "touch_injector_win_unittest.cc", ] - if (!use_x11 && is_linux) { - sources -= [ "linux/unicode_to_keysym_unittest.cc" ] - } if (use_ozone || is_chromeos) { sources -= [ "local_input_monitor_unittest.cc" ] } - if (is_chromeos) { - sources -= [ "linux/x_server_clipboard_unittest.cc" ] - } configs += [ "//remoting/build/config:version" ] @@ -555,6 +506,18 @@ source_set("unit_tests") { "//testing/gmock", "//testing/gtest", ] + + if (is_linux && !is_chromeos) { + deps += [ "//remoting/host/linux:unit_tests" ] + } + + if (is_chromeos) { + deps += [ + "//remoting/host/chromeos:unit_tests", + "//remoting/host/linux", # for AudioPipeReader + ] + } + if (is_win) { deps += [ "//remoting/host/win:unit_tests" ] } @@ -591,7 +554,7 @@ if (enable_remoting_host) { ] deps = [ - "//build/config/sanitizers:deps", + "//build/config:exe_and_shlib_deps", ] configs += [ "//build/config/compiler:wexit_time_destructors" ] @@ -795,7 +758,7 @@ if (enable_me2me_host) { deps = [ ":remoting_me2me_host_static", - "//build/config/sanitizers:deps", + "//build/config:exe_and_shlib_deps", "//remoting/base:breakpad", "//remoting/host/installer:credits", "//remoting/resources", diff --git a/chromium/remoting/host/chromeos/BUILD.gn b/chromium/remoting/host/chromeos/BUILD.gn new file mode 100644 index 00000000000..018276acae0 --- /dev/null +++ b/chromium/remoting/host/chromeos/BUILD.gn @@ -0,0 +1,61 @@ +# Copyright 2016 The Chromium Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +import("//remoting/build/config/remoting_build.gni") + +source_set("chromeos") { + sources = [ + "aura_desktop_capturer.cc", + "aura_desktop_capturer.h", + "clipboard_aura.cc", + "clipboard_aura.h", + "message_box.cc", + "message_box.h", + "mouse_cursor_monitor_aura.cc", + "mouse_cursor_monitor_aura.h", + "point_transformer.cc", + "point_transformer.h", + "skia_bitmap_desktop_frame.cc", + "skia_bitmap_desktop_frame.h", + ] + + public_deps = [ + "//cc", + "//gpu/command_buffer/common", + "//ppapi/host", + "//remoting/protocol", + "//skia", + "//third_party/webrtc/modules/desktop_capture", + "//ui/aura", + "//ui/compositor", + "//ui/events", + "//ui/views", + ] + + if (use_ash) { + public_deps += [ "//ash" ] + } +} + +# The host portions of the remoting unit tests. +source_set("unit_tests") { + testonly = true + + sources = [ + "aura_desktop_capturer_unittest.cc", + "clipboard_aura_unittest.cc", + ] + + configs += [ "//remoting/build/config:version" ] + + deps = [ + "//remoting/host", + "//remoting/host:test_support", + "//remoting/proto", + "//remoting/resources", + "//skia", + "//testing/gmock", + "//testing/gtest", + ] +} diff --git a/chromium/remoting/host/it2me/BUILD.gn b/chromium/remoting/host/it2me/BUILD.gn index 0908c7496cd..e732fe144d0 100644 --- a/chromium/remoting/host/it2me/BUILD.gn +++ b/chromium/remoting/host/it2me/BUILD.gn @@ -52,13 +52,14 @@ source_set("common") { ] if (is_desktop_linux) { - # GTK2 pulls pangoft2 as dependency, and pangoft2 depends on harfbuzz. - # To avoid missing indirectly referenced harfbuzz symbols from pango, - # some hack is required when bundled harfbuzz is used and component build is - # disabled. - # See crbug.com/462689 for details. - all_dependent_configs = [ "//third_party/harfbuzz-ng:pangoft2_link_hack" ] - deps += [ "//build/config/linux/gtk" ] + deps += [ + "//build/config/linux/gtk", + + # GTK pulls pangoft2, which requires HarfBuzz symbols. Since we + # link our own HarfBuzz, avoid mixing symbols from system HarfBuzz + # and own ones, hence the dependency to harfbuzz-ng here. + "//third_party/harfbuzz-ng", + ] } } @@ -202,7 +203,7 @@ if (!is_chromeos && enable_remoting_host) { deps = [ ":common", - "//build/config/sanitizers:deps", + "//build/config:exe_and_shlib_deps", "//remoting/host", "//remoting/host/native_messaging", "//remoting/proto", diff --git a/chromium/remoting/host/linux/BUILD.gn b/chromium/remoting/host/linux/BUILD.gn index 4315e8709cb..62e93e2da48 100644 --- a/chromium/remoting/host/linux/BUILD.gn +++ b/chromium/remoting/host/linux/BUILD.gn @@ -16,6 +16,7 @@ if (enable_me2me_host) { deps = [ "//base", + "//build/config:exe_and_shlib_deps", ] libs = [ "pam" ] @@ -55,22 +56,30 @@ source_set("linux") { "audio_pipe_reader.h", "certificate_watcher.cc", "certificate_watcher.h", - "unicode_to_keysym.cc", - "unicode_to_keysym.h", ] deps = [ "//remoting/protocol", "//third_party/webrtc/modules/desktop_capture", ] + public_deps = [] if (use_x11) { deps += [ ":x11" ] } + if (is_desktop_linux) { + deps += [ "//build/config/linux/gtk" ] + } } source_set("x11") { sources = [ + "unicode_to_keysym.cc", + "unicode_to_keysym.h", + "x11_character_injector.cc", + "x11_character_injector.h", + "x11_keyboard_impl.cc", + "x11_keyboard_impl.h", "x11_util.cc", "x11_util.h", "x_server_clipboard.cc", @@ -107,3 +116,39 @@ target("executable", "remoting_native_messaging_host") { [ "VERSION=" + "$chrome_version_major" + "." + "$remoting_version_patch" + "." + "$chrome_version_build" + "." + "$chrome_version_patch" ] } + +source_set("unit_tests") { + testonly = true + + sources = [ + "audio_pipe_reader_unittest.cc", + "certificate_watcher_unittest.cc", + "unicode_to_keysym_unittest.cc", + "x11_character_injector_unittest.cc", + "x_server_clipboard_unittest.cc", + ] + + if (!use_x11) { + sources -= [ "unicode_to_keysym_unittest.cc" ] + } + + configs += [ "//remoting/build/config:version" ] + + deps = [ + "//remoting/host", + "//remoting/host:test_support", + "//remoting/host/it2me:common", + "//remoting/host/native_messaging", + "//remoting/host/security_key:unit_tests", + "//remoting/host/setup", + "//remoting/proto", + "//remoting/resources", + "//skia", + "//testing/gmock", + "//testing/gtest", + ] + + if (!is_ios) { + deps += [ "//components/policy/core/browser:test_support" ] + } +} diff --git a/chromium/remoting/host/mac/BUILD.gn b/chromium/remoting/host/mac/BUILD.gn index 73cf0e87857..324bb4f4495 100644 --- a/chromium/remoting/host/mac/BUILD.gn +++ b/chromium/remoting/host/mac/BUILD.gn @@ -14,6 +14,8 @@ source_set("constants") { "constants_mac.cc", "constants_mac.h", ] + + deps = [ "//remoting/host:remoting_version" ] } # remoting_me2me_host-InfoPlist.strings @@ -73,7 +75,7 @@ target("mac_app_bundle", "remoting_me2me_host") { # } deps = [ - "//build/config/sanitizers:deps", + "//build/config:exe_and_shlib_deps", "//remoting/base:breakpad", "//remoting/host:main", "//remoting/host:remoting_me2me_host_static", diff --git a/chromium/remoting/host/win/BUILD.gn b/chromium/remoting/host/win/BUILD.gn index 683809b42bc..c1ae49c5c2d 100644 --- a/chromium/remoting/host/win/BUILD.gn +++ b/chromium/remoting/host/win/BUILD.gn @@ -78,9 +78,13 @@ windows_manifest("dpi_aware_uiaccess_require_admin_exe_manifest") { source_set("win") { sources = [ + "audio_volume_filter_win.cc", + "audio_volume_filter_win.h", "com_imported_mstscax.tlh", "com_security.cc", "com_security.h", + "default_audio_device_change_detector.cc", + "default_audio_device_change_detector.h", "elevation_helpers.cc", "elevation_helpers.h", "launch_process_with_token.cc", diff --git a/chromium/remoting/ios/BUILD.gn b/chromium/remoting/ios/BUILD.gn new file mode 100644 index 00000000000..50204d46e96 --- /dev/null +++ b/chromium/remoting/ios/BUILD.gn @@ -0,0 +1,86 @@ +# Copyright 2016 The Chromium Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +import("//remoting/build/config/remoting_build.gni") + +group("all") { + testonly = true + + deps = [ + ":ios_core", + "./app:all", + ] +} + +group("all_test") { + testonly = true + + deps = [ + ":ios_core_unit_tests", + ] +} + +source_set("ios_core") { + sources = [ + "client_gestures.h", + "client_gestures.mm", + "client_keyboard.h", + "client_keyboard.mm", + "host_preferences.h", + "host_preferences.mm", + "host_preferences_persistence.h", + "keychain_wrapper.h", + "keychain_wrapper.mm", + ] + + if (!is_chrome_branded) { + sources += [ "host_preferences_persistence_chromium.mm" ] + } else { + # TODO(nicholss): Until we have a private implementation of this, stub it + # with the chromium version. We still want the logic of is_chrome_branded + # but to get the release builds building we will just reuse the file. + sources += [ "host_preferences_persistence_chromium.mm" ] + } + + public_deps = [ + "//remoting/ios/domain", + "//remoting/ios/facade", + "//remoting/ios/session", + "//third_party/webrtc/base:rtc_base", + "//third_party/webrtc/modules/desktop_capture:primitives", + ] + + deps = [ + "//base", + "//remoting/protocol", + ] + + libs = [ + "CoreGraphics.framework", + "GLKit.framework", + "OpenGLES.framework", + ] + + configs += [ "//build/config/compiler:enable_arc" ] +} + +source_set("ios_core_unit_tests") { + testonly = true + + include_dirs = [ + "$root_gen_dir", + "//third_party/protobuf/src", + ] + + sources = [] + + deps = [ + ":ios_core", + "//testing/gtest", + ] + + configs += [ "//build/config/compiler:enable_arc" ] + + data = [] +} diff --git a/chromium/remoting/ios/app/BUILD.gn b/chromium/remoting/ios/app/BUILD.gn new file mode 100644 index 00000000000..81be7b3b4c5 --- /dev/null +++ b/chromium/remoting/ios/app/BUILD.gn @@ -0,0 +1,109 @@ +# Copyright 2017 The Chromium Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +import("//build/config/chrome_build.gni") +import("//build/config/ios/rules.gni") +import("//build/mac/tweak_info_plist.gni") +import("//build/util/process_version.gni") +import("//remoting/build/config/remoting_build.gni") + +group("all") { + testonly = true + + deps = [ + ":ios_remoting_app", + ] +} + +source_set("main") { + sources = [ + "app_delegate.h", + "app_delegate.mm", + "client_connection_view_controller.h", + "client_connection_view_controller.mm", + "host_collection_view_cell.h", + "host_collection_view_cell.mm", + "host_collection_view_controller.h", + "host_collection_view_controller.mm", + "host_view_controller.h", + "host_view_controller.mm", + "main.mm", + "pin_entry_view.h", + "pin_entry_view.mm", + "remoting_settings_view_controller.h", + "remoting_settings_view_controller.mm", + "remoting_view_controller.h", + "remoting_view_controller.mm", + ] + + deps = [ + "//base", + "//google_apis", + "//remoting/base", + "//remoting/client", + "//remoting/client/input", + "//remoting/ios:ios_core", + "//remoting/protocol", + "//ui/base", + "//ui/gfx", + "//ui/resources", + ] + + public_deps = [ + "//ios/third_party/material_components_ios", + ] + + configs += [ "//build/config/compiler:enable_arc" ] +} + +tweak_info_plist("tweak_info_plist") { + info_plist = "//remoting/ios/app/resources/Info.plist" + args = [ "--platform=ios" ] +} + +ios_app_bundle("ios_remoting_app") { + output_name = "$remoting_ios_executable_name" + + entitlements_path = "resources/Remoting.entitlements" + info_plist_target = ":tweak_info_plist" + + extra_substitutions = [ + "BUNDLE_IDENTIFIER=$remoting_ios_bundle_id", + "DISPLAY_NAME=$remoting_ios_display_name", + "EXECUTABLE_NAME=$remoting_ios_executable_name", + "MINIMUM_OS_VERSION=7.0", + "PRODUCT_NAME=$remoting_ios_product_name", + "VERSION_FULL=$remoting_version_full", + "VERSION_SHORT=$remoting_version_short", + ] + + libs = [ + "Accelerate.framework", + "AudioToolbox.framework", + "CoreAudio.framework", + "CoreData.framework", + "CoreMIDI.framework", + "CoreVideo.framework", + "GLKit.framework", + "OpenGLES.framework", + "Webkit.framework", + "SafariServices.framework", + "SystemConfiguration.framework", + ] + + deps = [ + ":main", + "//base", + "//remoting/ios/app/resources:assets", + "//remoting/ios/app/resources:launchscreen_assets", + "//remoting/ios/app/resources:remoting_icons", + "//remoting/ios/display", + ] + + bundle_deps = [ ":launchscreen_storyboard" ] +} + +bundle_data_ib_file("launchscreen_storyboard") { + source = "resources/LaunchScreen.storyboard" +} diff --git a/chromium/remoting/ios/app/resources/BUILD.gn b/chromium/remoting/ios/app/resources/BUILD.gn new file mode 100644 index 00000000000..5f15eb31c95 --- /dev/null +++ b/chromium/remoting/ios/app/resources/BUILD.gn @@ -0,0 +1,74 @@ +# Copyright 2017 The Chromium Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +import("//build/config/chrome_build.gni") +import("//build/config/ios/rules.gni") +import("//remoting/build/config/remoting_build.gni") + +bundle_data("assets") { + sources = [ + "Assets.xcassets/ic_desktop.imageset/Contents.json", + "Assets.xcassets/ic_desktop.imageset/ic_desktop.png", + "Assets.xcassets/ic_desktop.imageset/ic_desktop@2x.png", + "Assets.xcassets/ic_desktop.imageset/ic_desktop@3x.png", + "Assets.xcassets/ic_desktop_windows.imageset/Contents.json", + "Assets.xcassets/ic_desktop_windows.imageset/ic_desktop_windows.png", + "Assets.xcassets/ic_desktop_windows.imageset/ic_desktop_windows@2x.png", + "Assets.xcassets/ic_desktop_windows.imageset/ic_desktop_windows@3x.png", + "Assets.xcassets/ic_fullscreen.imageset/Contents.json", + "Assets.xcassets/ic_fullscreen.imageset/ic_fullscreen.png", + "Assets.xcassets/ic_fullscreen.imageset/ic_fullscreen@2x.png", + "Assets.xcassets/ic_fullscreen.imageset/ic_fullscreen@3x.png", + "Assets.xcassets/ic_fullscreen_exit.imageset/Contents.json", + "Assets.xcassets/ic_fullscreen_exit.imageset/ic_fullscreen_exit.png", + "Assets.xcassets/ic_fullscreen_exit.imageset/ic_fullscreen_exit@2x.png", + "Assets.xcassets/ic_fullscreen_exit.imageset/ic_fullscreen_exit@3x.png", + "Assets.xcassets/ic_mouse.imageset/Contents.json", + "Assets.xcassets/ic_mouse.imageset/ic_mouse.png", + "Assets.xcassets/ic_mouse.imageset/ic_mouse@2x.png", + "Assets.xcassets/ic_mouse.imageset/ic_mouse@3x.png", + "Assets.xcassets/ic_touch_app.imageset/Contents.json", + "Assets.xcassets/ic_touch_app.imageset/ic_touch_app.png", + "Assets.xcassets/ic_touch_app.imageset/ic_touch_app_2x.png", + "Assets.xcassets/ic_touch_app.imageset/ic_touch_app_3x.png", + ] + outputs = [ + "{{bundle_resources_dir}}/{{source_file_part}}", + ] +} + +bundle_data("launchscreen_assets") { + sources = [ + "launchscreen_images.xcassets/Contents.json", + "launchscreen_images.xcassets/launchscreen_app_logo.imageset/Contents.json", + "launchscreen_images.xcassets/launchscreen_app_logo.imageset/launchscreen_app_logo.png", + "launchscreen_images.xcassets/launchscreen_app_logo.imageset/launchscreen_app_logo@2x.png", + "launchscreen_images.xcassets/launchscreen_app_logo.imageset/launchscreen_app_logo@3x.png", + "launchscreen_images.xcassets/launchscreen_brand_name.imageset/Contents.json", + "launchscreen_images.xcassets/launchscreen_brand_name.imageset/launchscreen_brand_name.png", + "launchscreen_images.xcassets/launchscreen_brand_name.imageset/launchscreen_brand_name@2x.png", + "launchscreen_images.xcassets/launchscreen_brand_name.imageset/launchscreen_brand_name@3x.png", + ] + outputs = [ + "{{bundle_resources_dir}}/{{source_file_part}}", + ] +} + +bundle_data("remoting_icons") { + sources = [ + "chromium/Icon-120.png", + "chromium/Icon-152.png", + "chromium/Icon-167.png", + "chromium/Icon-180.png", + "chromium/Icon-29.png", + "chromium/Icon-40.png", + "chromium/Icon-58.png", + "chromium/Icon-76.png", + "chromium/Icon-80.png", + "chromium/Icon-87.png", + ] + outputs = [ + "{{bundle_resources_dir}}/{{source_file_part}}", + ] +} diff --git a/chromium/remoting/ios/display/BUILD.gn b/chromium/remoting/ios/display/BUILD.gn new file mode 100644 index 00000000000..a1e2a3baa53 --- /dev/null +++ b/chromium/remoting/ios/display/BUILD.gn @@ -0,0 +1,47 @@ +# Copyright 2017 The Chromium Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +group("all") { + testonly = true + + deps = [ + ":display", + ] +} + +group("all_test") { + testonly = true + + deps = [] +} + +source_set("display") { + sources = [ + "gl_demo_screen.h", + "gl_demo_screen.mm", + "gl_display_handler.h", + "gl_display_handler.mm", + ] + + public_deps = [ + "//remoting/client", + "//third_party/protobuf:protobuf_lite", + "//third_party/webrtc/base:rtc_base_approved", + ] + + deps = [ + "//base", + "//remoting/client/display", + ] + + include_dirs = [ "//third_party/protobuf/src" ] + + libs = [ + "CoreGraphics.framework", + "GLKit.framework", + "OpenGLES.framework", + ] + + configs += [ "//build/config/compiler:enable_arc" ] +} diff --git a/chromium/remoting/ios/domain/BUILD.gn b/chromium/remoting/ios/domain/BUILD.gn new file mode 100644 index 00000000000..4f7085115e2 --- /dev/null +++ b/chromium/remoting/ios/domain/BUILD.gn @@ -0,0 +1,20 @@ +# Copyright 2017 The Chromium Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +import("//build/config/chrome_build.gni") +import("//build/config/ios/rules.gni") +import("//remoting/build/config/remoting_build.gni") + +source_set("domain") { + sources = [ + "client_session_details.h", + "client_session_details.mm", + "host_info.h", + "host_info.mm", + "user_info.h", + "user_info.mm", + ] + + configs += [ "//build/config/compiler:enable_arc" ] +} diff --git a/chromium/remoting/ios/facade/BUILD.gn b/chromium/remoting/ios/facade/BUILD.gn new file mode 100644 index 00000000000..bbc9b1c0fdf --- /dev/null +++ b/chromium/remoting/ios/facade/BUILD.gn @@ -0,0 +1,30 @@ +# Copyright 2017 The Chromium Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +import("//build/config/chrome_build.gni") +import("//build/config/ios/rules.gni") +import("//remoting/build/config/remoting_build.gni") + +source_set("facade") { + sources = [ + "host_info.cc", + "host_info.h", + "host_list_fetcher.cc", + "host_list_fetcher.h", + "ios_client_runtime_delegate.h", + "ios_client_runtime_delegate.mm", + "remoting_authentication.h", + "remoting_authentication.mm", + "remoting_service.h", + "remoting_service.mm", + ] + + deps = [ + "//base", + "//remoting/base:authorization", + "//remoting/ios/domain", + ] + + configs += [ "//build/config/compiler:enable_arc" ] +} diff --git a/chromium/remoting/ios/session/BUILD.gn b/chromium/remoting/ios/session/BUILD.gn new file mode 100644 index 00000000000..97f3f19dcb5 --- /dev/null +++ b/chromium/remoting/ios/session/BUILD.gn @@ -0,0 +1,28 @@ +# Copyright 2017 The Chromium Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +import("//build/config/chrome_build.gni") +import("//build/config/ios/rules.gni") +import("//remoting/build/config/remoting_build.gni") + +source_set("session") { + sources = [ + "remoting_client.h", + "remoting_client.mm", + "remoting_client_session_delegate.h", + "remoting_client_session_delegate.mm", + ] + + deps = [ + "//base", + "//remoting/client", + "//remoting/client/display", + "//remoting/client/ui", + "//remoting/ios/display", + "//remoting/ios/domain", + "//remoting/protocol", + ] + + configs += [ "//build/config/compiler:enable_arc" ] +} diff --git a/chromium/remoting/proto/BUILD.gn b/chromium/remoting/proto/BUILD.gn index 853267e6109..64e0f2304a8 100644 --- a/chromium/remoting/proto/BUILD.gn +++ b/chromium/remoting/proto/BUILD.gn @@ -18,6 +18,7 @@ proto_library("proto") { "event.proto", "internal.proto", "mux.proto", + "process_stats.proto", "video.proto", "video_stats.proto", ] diff --git a/chromium/remoting/protocol/BUILD.gn b/chromium/remoting/protocol/BUILD.gn index 92a4256ecc2..f9d4099c6b8 100644 --- a/chromium/remoting/protocol/BUILD.gn +++ b/chromium/remoting/protocol/BUILD.gn @@ -128,6 +128,7 @@ static_library("protocol") { "port_allocator_factory.h", "port_range.cc", "port_range.h", + "process_stats_stub.h", "pseudotcp_adapter.cc", "pseudotcp_adapter.h", "pseudotcp_channel_factory.cc", diff --git a/chromium/remoting/remoting_enable.gni b/chromium/remoting/remoting_enable.gni index a0319767e03..ceb5331027e 100644 --- a/chromium/remoting/remoting_enable.gni +++ b/chromium/remoting/remoting_enable.gni @@ -6,5 +6,5 @@ import("//build/config/ui.gni") import("//media/media_options.gni") declare_args() { - enable_remoting = !is_chromecast && enable_webrtc + enable_remoting = !is_chromecast && !is_fuchsia && enable_webrtc } diff --git a/chromium/remoting/remoting_locales.gni b/chromium/remoting/remoting_locales.gni index a9702de66ef..3dfd0a3047a 100644 --- a/chromium/remoting/remoting_locales.gni +++ b/chromium/remoting/remoting_locales.gni @@ -19,7 +19,6 @@ remoting_locales = [ "en", "en-GB", "es", - "es-419", "et", "fa", @@ -48,7 +47,6 @@ remoting_locales = [ "nb", "nl", "pl", - "pt-BR", "pt-PT", "ro", "ru", @@ -73,38 +71,50 @@ remoting_locales = [ remoting_locales_with_underscores = remoting_locales remoting_locales_with_underscores -= [ "en-GB", - "es-419", "fake-bidi", - "pt-BR", "pt-PT", "zh-CN", "zh-TW", ] remoting_locales_with_underscores += [ "en_GB", - "es_419", "fake_bidi", - "pt_BR", "pt_PT", "zh_CN", "zh_TW", ] -if (is_chromeos) { +# An additional locale "en-US" is generated for ChromeOS and Chrome on iOS. +if (is_chromeos || is_ios) { remoting_locales += [ "en-US" ] remoting_locales_with_underscores += [ "en_US" ] } -messages_locales = remoting_locales_with_underscores -if (!is_chromeos) { - # The messages output includes a separate one for en-US that the pak ones - # don't have. We don't need to do this on ChromeOS since en_US is in the - # locales list be default there. - messages_locales += [ "en_US" ] +# Locales "pt-BR" and "es-419" are named "pt" and "es-MX" respectively on iOS. +if (!is_ios) { + remoting_locales += [ + "pt-BR", + "es-419", + ] + remoting_locales_with_underscores += [ + "pt_BR", + "es_419", + ] +} else { + remoting_locales += [ + "pt", + "es-MX", + ] + remoting_locales_with_underscores += [ + "pt", + "es_MX", + ] } +messages_locales = remoting_locales_with_underscores + remoting_android_locales = [ "am", "ar", diff --git a/chromium/remoting/resources/BUILD.gn b/chromium/remoting/resources/BUILD.gn index 3cc91d80167..a12b0e24a58 100644 --- a/chromium/remoting/resources/BUILD.gn +++ b/chromium/remoting/resources/BUILD.gn @@ -47,7 +47,7 @@ action("verify_resources") { inputs = [ "remoting_strings.grd" ] + sources_to_verify - stampfile = "$root_build_dir/remoting_resources_verified_stamp" + stampfile = "$root_out_dir/remoting_resources_verified_stamp" outputs = [ stampfile, ] @@ -115,8 +115,9 @@ action("copy_locales") { # replacement over the locales. Here, we can do this in GN script by # pretending the locale list is a list of files. The {{source_name_part}} # will just expand to the locale name. - inputs = process_file_template(remoting_locales, - [ "$target_gen_dir/{{source_name_part}}.pak" ]) + inputs = process_file_template( + remoting_locales, + [ "$root_gen_dir/remoting/resources/{{source_name_part}}.pak" ]) # Likewise, process the outputs in the same way as the inputs. if (is_mac || is_ios) { @@ -124,11 +125,11 @@ action("copy_locales") { # different place. outputs = process_file_template( remoting_locales_with_underscores, - [ "$root_build_dir/remoting/resources/{{source_name_part}}.lproj/locale.pak" ]) + [ "$root_out_dir/remoting/resources/{{source_name_part}}.lproj/locale.pak" ]) } else { outputs = process_file_template( remoting_locales, - [ "$root_build_dir/remoting_locales/{{source_name_part}}.pak" ]) + [ "$root_out_dir/remoting_locales/{{source_name_part}}.pak" ]) } args = [ diff --git a/chromium/remoting/test/BUILD.gn b/chromium/remoting/test/BUILD.gn index 18dc5f1102a..7aa0a1193f0 100644 --- a/chromium/remoting/test/BUILD.gn +++ b/chromium/remoting/test/BUILD.gn @@ -103,7 +103,7 @@ executable("chromoting_test_driver") { deps = [ ":test_support", "//base/test:test_support", - "//build/config/sanitizers:deps", + "//build/config:exe_and_shlib_deps", "//build/win:default_exe_manifest", "//testing/gtest", ] @@ -142,7 +142,7 @@ executable("ar_sample_test_driver") { deps = [ ":ar_test_driver_common", "//base/test:test_support", - "//build/config/sanitizers:deps", + "//build/config:exe_and_shlib_deps", "//build/win:default_exe_manifest", "//testing/gtest", ] @@ -173,6 +173,7 @@ if (enable_remoting_host && !is_android && !is_chromeos) { deps = [ ":fake_connection_event_logger", + "//base/test:test_support", "//third_party/webrtc/modules/desktop_capture", ] diff --git a/chromium/remoting/tools/javascript_key_tester/pnacl/BUILD.gn b/chromium/remoting/tools/javascript_key_tester/pnacl/BUILD.gn index fbd8935123f..13cc0124cf6 100644 --- a/chromium/remoting/tools/javascript_key_tester/pnacl/BUILD.gn +++ b/chromium/remoting/tools/javascript_key_tester/pnacl/BUILD.gn @@ -11,7 +11,7 @@ executable("remoting_key_tester_newlib") { ] deps = [ - "//build/config/sanitizers:deps", + "//build/config:exe_and_shlib_deps", "//ppapi/cpp", "//ppapi/native_client:ppapi_lib", ] diff --git a/chromium/remoting/webapp/build_template.gni b/chromium/remoting/webapp/build_template.gni index e3c03393a9c..28b4c91b18f 100644 --- a/chromium/remoting/webapp/build_template.gni +++ b/chromium/remoting/webapp/build_template.gni @@ -83,7 +83,7 @@ template("build_webapp_html") { "--out_file", rebase_path(target_jscompile_stamp, root_build_dir), "--closure_args", - ] + closure_args + extra_closure_args + ] + default_closure_args + extra_closure_args args += [ "--externs" ] + rebase_path(externs, root_build_dir) } } diff --git a/chromium/remoting/webapp/files.gni b/chromium/remoting/webapp/files.gni index 8540ef997e5..2dfd7428ec2 100644 --- a/chromium/remoting/webapp/files.gni +++ b/chromium/remoting/webapp/files.gni @@ -105,6 +105,7 @@ remoting_webapp_unittests_js_files = [ "base/js/xmpp_login_handler_unittest.js", "base/js/xmpp_stream_parser_unittest.js", "crd/js/apps_v2_migration_unittest.js", + "crd/js/butter_bar_unittest.js", "crd/js/combined_host_list_api_unittest.js", "crd/js/gcd_client_unittest.js", "crd/js/gcd_client_with_mock_xhr_unittest.js", @@ -206,7 +207,6 @@ remoting_webapp_shared_js_host_files = [ remoting_webapp_shared_js_logging_files = [ "base/js/format_iq.js", "base/js/session_logger.js", - "base/js/stats_accumulator.js", ] # Remoting signaling files. -- cgit v1.2.1