diff options
author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-07-16 11:45:35 +0200 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-07-17 08:59:23 +0000 |
commit | 552906b0f222c5d5dd11b9fd73829d510980461a (patch) | |
tree | 3a11e6ed0538a81dd83b20cf3a4783e297f26d91 /chromium/android_webview/tools/automated_ui_tests/BUILD.gn | |
parent | 1b05827804eaf047779b597718c03e7d38344261 (diff) |
BASELINE: Update Chromium to 83.0.4103.122
Change-Id: Ie3a82f5bb0076eec2a7c6a6162326b4301ee291e
Reviewed-by: Michael BrĂ¼ning <michael.bruning@qt.io>
Diffstat (limited to 'chromium/android_webview/tools/automated_ui_tests/BUILD.gn')
-rw-r--r-- | chromium/android_webview/tools/automated_ui_tests/BUILD.gn | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/chromium/android_webview/tools/automated_ui_tests/BUILD.gn b/chromium/android_webview/tools/automated_ui_tests/BUILD.gn index 03b3c41b9a7..47fb5daf6d7 100644 --- a/chromium/android_webview/tools/automated_ui_tests/BUILD.gn +++ b/chromium/android_webview/tools/automated_ui_tests/BUILD.gn @@ -23,7 +23,7 @@ android_apk("webview_ui_test_app_apk") { } android_library("webview_ui_test_app_java") { - java_files = + sources = [ "java/src/org/chromium/webview_ui_test/WebViewUiTestActivity.java" ] deps = [ ":webview_ui_test_app_apk_resources", @@ -34,7 +34,11 @@ android_library("webview_ui_test_app_java") { } android_resources("webview_ui_test_app_apk_resources") { - resource_dirs = [ "java/res" ] + sources = [ + "java/res/layout/edittext_webview.xml", + "java/res/layout/fullscreen_webview.xml", + "java/res/values/strings.xml", + ] custom_package = "org.chromium.webview_ui_test" } @@ -42,15 +46,15 @@ instrumentation_test_apk("webview_ui_test_app_test_apk") { apk_name = "WebViewUiTestAppTest" apk_under_test = ":webview_ui_test_app_apk" android_manifest = "javatests/AndroidManifest.xml" - java_files = [ + sources = [ "javatests/src/org/chromium/webview_ui_test/test/ActionModeTest.java", "javatests/src/org/chromium/webview_ui_test/test/DropDownListTest.java", "javatests/src/org/chromium/webview_ui_test/test/WebViewJSTest.java", "javatests/src/org/chromium/webview_ui_test/test/util/Actions.java", "javatests/src/org/chromium/webview_ui_test/test/util/Atoms.java", "javatests/src/org/chromium/webview_ui_test/test/util/UseLayout.java", - "javatests/src/org/chromium/webview_ui_test/test/util/WebViewUiTestRule.java", "javatests/src/org/chromium/webview_ui_test/test/util/WebViewSyncWrapper.java", + "javatests/src/org/chromium/webview_ui_test/test/util/WebViewUiTestRule.java", ] deps = [ ":webview_ui_test_app_apk_resources", @@ -66,8 +70,6 @@ instrumentation_test_apk("webview_ui_test_app_test_apk") { "//third_party/junit", "//third_party/ub-uiautomator:ub_uiautomator_java", ] - data = [ - "test/data/", - ] + data = [ "test/data/" ] use_webview_provider = system_webview_apk_target } |