diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-10-12 14:27:29 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-10-13 09:35:20 +0000 |
| commit | c30a6232df03e1efbd9f3b226777b07e087a1122 (patch) | |
| tree | e992f45784689f373bcc38d1b79a239ebe17ee23 /chromium/remoting/ios | |
| parent | 7b5b123ac58f58ffde0f4f6e488bcd09aa4decd3 (diff) | |
| download | qtwebengine-chromium-85-based.tar.gz | |
BASELINE: Update Chromium to 85.0.4183.14085-based
Change-Id: Iaa42f4680837c57725b1344f108c0196741f6057
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'chromium/remoting/ios')
| -rw-r--r-- | chromium/remoting/ios/BUILD.gn | 12 | ||||
| -rw-r--r-- | chromium/remoting/ios/app/BUILD.gn | 11 |
2 files changed, 8 insertions, 15 deletions
diff --git a/chromium/remoting/ios/BUILD.gn b/chromium/remoting/ios/BUILD.gn index 9f0191e3f15..88fcd9231b2 100644 --- a/chromium/remoting/ios/BUILD.gn +++ b/chromium/remoting/ios/BUILD.gn @@ -2,7 +2,6 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. -import("//ios/third_party/features.gni") import("//remoting/build/config/remoting_build.gni") import("//remoting/remoting_locales.gni") @@ -76,6 +75,7 @@ test("ios_remoting_unittests") { deps = [ "//base/test:run_all_unittests", "//base/test:test_support", + "//ios/third_party/material_components_ios:material_components_ios+link", "//remoting/ios/audio:unit_tests", "//remoting/ios/facade:unit_tests", "//remoting/ios/persistence:unit_tests", @@ -85,13 +85,9 @@ test("ios_remoting_unittests") { deps += [ ":unittests_locale_${locale}_bundle_data" ] } - if (ios_third_party_material_components_built_as_framework) { - deps += [ - "//ios/third_party/material_components_ios:material_components_ios+link", - ] - - bundle_deps = [ "//ios/third_party/material_components_ios:material_components_ios+bundle" ] - } + bundle_deps = [ + "//ios/third_party/material_components_ios:material_components_ios+bundle", + ] } foreach(locale, remoting_locales_with_underscores) { diff --git a/chromium/remoting/ios/app/BUILD.gn b/chromium/remoting/ios/app/BUILD.gn index 1275ad00711..dd41ee4c118 100644 --- a/chromium/remoting/ios/app/BUILD.gn +++ b/chromium/remoting/ios/app/BUILD.gn @@ -2,7 +2,6 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. -import("//ios/third_party/features.gni") import("//remoting/build/config/remoting_build.gni") import("//remoting/ios/app/remoting_ios_tmpl.gni") @@ -145,14 +144,12 @@ ios_remoting_app_tmpl("ios_remoting_app") { entitlements_path = "resources/Remoting.entitlements" deps = [ ":app_source_set", + "//ios/third_party/material_components_ios:material_components_ios+link", "//remoting/ios/app/resources:launchscreen_assets", "//remoting/ios/app/resources:remoting_icons", ] - if (ios_third_party_material_components_built_as_framework) { - deps += [ - "//ios/third_party/material_components_ios:material_components_ios+link", - ] - bundle_deps = [ "//ios/third_party/material_components_ios:material_components_ios+bundle" ] - } + bundle_deps = [ + "//ios/third_party/material_components_ios:material_components_ios+bundle", + ] } |