diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-01-31 16:33:43 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-02-06 16:33:22 +0000 |
| commit | da51f56cc21233c2d30f0fe0d171727c3102b2e0 (patch) | |
| tree | 4e579ab70ce4b19bee7984237f3ce05a96d59d83 /chromium/remoting | |
| parent | c8c2d1901aec01e934adf561a9fdf0cc776cdef8 (diff) | |
| download | qtwebengine-chromium-da51f56cc21233c2d30f0fe0d171727c3102b2e0.tar.gz | |
BASELINE: Update Chromium to 65.0.3525.40
Also imports missing submodules
Change-Id: I36901b7c6a325cda3d2c10cedb2186c25af3b79b
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'chromium/remoting')
| -rw-r--r-- | chromium/remoting/android/client_java_tmpl.gni | 4 | ||||
| -rw-r--r-- | chromium/remoting/ios/session/BUILD.gn | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/chromium/remoting/android/client_java_tmpl.gni b/chromium/remoting/android/client_java_tmpl.gni index 57f64067bbf..4db1dea68b9 100644 --- a/chromium/remoting/android/client_java_tmpl.gni +++ b/chromium/remoting/android/client_java_tmpl.gni @@ -105,7 +105,7 @@ template("remoting_android_client_java_tmpl") { deps += [ invoker.remoting_google_play_services_library ] } - # Manifest used for linting (determining unused resources). - android_manifest = "$root_gen_dir/remoting/android/AndroidManifest.xml" + android_manifest_for_lint = + "$root_gen_dir/remoting/android/AndroidManifest.xml" } } diff --git a/chromium/remoting/ios/session/BUILD.gn b/chromium/remoting/ios/session/BUILD.gn index 97f3f19dcb5..03131b50011 100644 --- a/chromium/remoting/ios/session/BUILD.gn +++ b/chromium/remoting/ios/session/BUILD.gn @@ -16,6 +16,7 @@ source_set("session") { deps = [ "//base", + "//ios/third_party/material_components_ios", "//remoting/client", "//remoting/client/display", "//remoting/client/ui", |