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/android_webview/tools | |
| 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/android_webview/tools')
3 files changed, 2 insertions, 35 deletions
diff --git a/chromium/android_webview/tools/automated_ui_tests/BUILD.gn b/chromium/android_webview/tools/automated_ui_tests/BUILD.gn index 8c4d2052476..65159817753 100644 --- a/chromium/android_webview/tools/automated_ui_tests/BUILD.gn +++ b/chromium/android_webview/tools/automated_ui_tests/BUILD.gn @@ -60,10 +60,10 @@ instrumentation_test_apk("webview_ui_test_app_test_apk") { "//base:base_java", "//base:base_java_test_support", "//third_party/android_deps:androidx_annotation_annotation_java", + "//third_party/android_deps:espresso_java", "//third_party/android_sdk:android_test_base_java", "//third_party/android_support_test_runner:rules_java", "//third_party/android_support_test_runner:runner_java", - "//third_party/espresso:espresso_all_java", "//third_party/hamcrest:hamcrest_java", "//third_party/junit", "//third_party/ub-uiautomator:ub_uiautomator_java", diff --git a/chromium/android_webview/tools/system_webview_shell/BUILD.gn b/chromium/android_webview/tools/system_webview_shell/BUILD.gn index 454403c5601..bb540814f9b 100644 --- a/chromium/android_webview/tools/system_webview_shell/BUILD.gn +++ b/chromium/android_webview/tools/system_webview_shell/BUILD.gn @@ -116,6 +116,7 @@ instrumentation_test_apk("system_webview_shell_layout_test_apk") { "//base:base_java", "//base:base_java_test_support", "//testing/android/reporter:reporter_java", + "//third_party/android_sdk:android_test_base_java", "//third_party/android_support_test_runner:rules_java", "//third_party/android_support_test_runner:runner_java", "//third_party/junit", diff --git a/chromium/android_webview/tools/webview_log_verbosifier/BUILD.gn b/chromium/android_webview/tools/webview_log_verbosifier/BUILD.gn deleted file mode 100644 index 082186ebf39..00000000000 --- a/chromium/android_webview/tools/webview_log_verbosifier/BUILD.gn +++ /dev/null @@ -1,34 +0,0 @@ -# Copyright 2018 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/android/rules.gni") - -android_apk("webview_log_verbosifier_apk") { - apk_name = "WebViewLogVerbosifier" - android_manifest = "AndroidManifest.xml" - deps = [ ":webview_log_verbosifier_resources" ] - min_sdk_version = 21 - target_sdk_version = 28 -} - -android_resources("webview_log_verbosifier_resources") { - sources = [ - "res/drawable-v24/ic_launcher_foreground.xml", - "res/drawable/ic_launcher_background.xml", - "res/mipmap-anydpi-v26/ic_launcher.xml", - "res/mipmap-anydpi-v26/ic_launcher_round.xml", - "res/mipmap-hdpi/ic_launcher.png", - "res/mipmap-hdpi/ic_launcher_round.png", - "res/mipmap-mdpi/ic_launcher.png", - "res/mipmap-mdpi/ic_launcher_round.png", - "res/mipmap-xhdpi/ic_launcher.png", - "res/mipmap-xhdpi/ic_launcher_round.png", - "res/mipmap-xxhdpi/ic_launcher.png", - "res/mipmap-xxhdpi/ic_launcher_round.png", - "res/mipmap-xxxhdpi/ic_launcher.png", - "res/mipmap-xxxhdpi/ic_launcher_round.png", - "res/values/ic_launcher_background.xml", - ] - custom_package = "org.chromium.webview_log_verbosifier" -} |