diff options
Diffstat (limited to 'chromium/ios/web_view/shell')
| -rw-r--r-- | chromium/ios/web_view/shell/BUILD.gn | 23 | ||||
| -rw-r--r-- | chromium/ios/web_view/shell/test/BUILD.gn | 11 |
2 files changed, 13 insertions, 21 deletions
diff --git a/chromium/ios/web_view/shell/BUILD.gn b/chromium/ios/web_view/shell/BUILD.gn index 70bb0f1199e..3920690e072 100644 --- a/chromium/ios/web_view/shell/BUILD.gn +++ b/chromium/ios/web_view/shell/BUILD.gn @@ -3,7 +3,6 @@ # found in the LICENSE file. import("//build/config/ios/rules.gni") -import("//ios/third_party/features.gni") declare_args() { # Authorization service implementation used in ios_web_view_shell. Uses a fake @@ -40,18 +39,16 @@ ios_app_bundle("ios_web_view_shell") { ] entitlements_path = ios_web_view_shell_entitlements_path - if (ios_third_party_material_components_built_as_framework) { - if (ios_web_view_shell_links_with_material_components_framework) { - deps += [ - "//ios/third_party/material_components_ios:material_components_ios+bundle", - "//ios/third_party/material_components_ios:material_components_ios+link", - ] - } else { - assert_no_deps = [ - "//ios/third_party/material_components_ios:material_components_ios+bundle", - "//ios/third_party/material_components_ios:material_components_ios+link", - ] - } + if (ios_web_view_shell_links_with_material_components_framework) { + deps += [ + "//ios/third_party/material_components_ios:material_components_ios+bundle", + "//ios/third_party/material_components_ios:material_components_ios+link", + ] + } else { + assert_no_deps = [ + "//ios/third_party/material_components_ios:material_components_ios+bundle", + "//ios/third_party/material_components_ios:material_components_ios+link", + ] } configs += [ "//build/config/compiler:enable_arc" ] diff --git a/chromium/ios/web_view/shell/test/BUILD.gn b/chromium/ios/web_view/shell/test/BUILD.gn index 63c4ddf4815..b717678567f 100644 --- a/chromium/ios/web_view/shell/test/BUILD.gn +++ b/chromium/ios/web_view/shell/test/BUILD.gn @@ -4,8 +4,8 @@ import("//ios/build/config.gni") import("//ios/third_party/earl_grey/ios_eg_test.gni") -import("//ios/third_party/features.gni") +# TODO(crbug.com/698657): Remove these EarlGrey tests or convert to EarlGrey 2. group("all_tests") { testonly = true deps = [ ":ios_web_view_shell_egtests" ] @@ -19,19 +19,14 @@ ios_eg_test("ios_web_view_shell_egtests") { deps = [ ":earl_grey_test_support", "//ios/testing:http_server_bundle_data", + "//ios/third_party/material_components_ios:material_components_ios+bundle", + "//ios/third_party/material_components_ios:material_components_ios+link", "//ios/web_view:web_view+link", "//ios/web_view/shell:shell", "//ios/web_view/test:test_support", "//net:test_support", ] - if (ios_third_party_material_components_built_as_framework) { - deps += [ - "//ios/third_party/material_components_ios:material_components_ios+bundle", - "//ios/third_party/material_components_ios:material_components_ios+link", - ] - } - configs += [ "//build/config/compiler:enable_arc" ] assert_no_deps = ios_assert_no_deps |