diff options
Diffstat (limited to 'chromium/android_webview/test')
| -rw-r--r-- | chromium/android_webview/test/BUILD.gn | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/chromium/android_webview/test/BUILD.gn b/chromium/android_webview/test/BUILD.gn index 2b26381232d..4a770649451 100644 --- a/chromium/android_webview/test/BUILD.gn +++ b/chromium/android_webview/test/BUILD.gn @@ -10,12 +10,12 @@ testonly = true group("test") { deps = [ - ":android_webview_test_apk", ":android_webview_unittests", + ":webview_instrumentation_test_apk", ] } -android_apk("android_webview_apk") { +android_apk("webview_instrumentation_apk") { deps = [ ":android_webview_apk_assets", ":android_webview_apk_resources", @@ -28,7 +28,7 @@ android_apk("android_webview_apk") { "//ui/android:ui_java", ] - apk_name = "AndroidWebView" + apk_name = "WebViewInstrumentation" android_manifest = "shell/AndroidManifest.xml" java_files = [ "shell/src/org/chromium/android_webview/shell/AwShellActivity.java", @@ -88,7 +88,7 @@ android_assets("android_webview_apk_assets") { shared_library("libstandalonelibwebviewchromium") { sources = [ - "../lib/main/webview_entry_point.cc", + "../lib/webview_entry_point.cc", ] ldflags = [ "-Wl,-shared,-Bsymbolic" ] deps = [ @@ -98,9 +98,9 @@ shared_library("libstandalonelibwebviewchromium") { configs += [ "//build/config/android:hide_all_but_jni" ] } -instrumentation_test_apk("android_webview_test_apk") { - apk_name = "AndroidWebViewTest" - apk_under_test = ":android_webview_apk" +instrumentation_test_apk("webview_instrumentation_test_apk") { + apk_name = "WebViewInstrumentationTest" + apk_under_test = ":webview_instrumentation_apk" android_manifest = "../javatests/AndroidManifest.xml" deps = [ "//android_webview:android_webview_crash_services_java", @@ -245,27 +245,27 @@ test("android_webview_unittests") { ] sources = [ + "../browser/address_parser_unittest.cc", + "../browser/aw_contents_client_bridge_unittest.cc", "../browser/aw_form_database_service_unittest.cc", + "../browser/aw_media_url_interceptor_unittest.cc", "../browser/aw_permission_manager_unittest.cc", "../browser/aw_static_cookie_policy_unittest.cc", "../browser/browser_view_renderer_unittest.cc", "../browser/command_line_helper_unittest.cc", + "../browser/input_stream_unittest.cc", "../browser/net/android_stream_reader_url_request_job_unittest.cc", "../browser/net/aw_cookie_store_wrapper_unittest.cc", "../browser/net/input_stream_reader_unittest.cc", + "../browser/permission/media_access_permission_request_unittest.cc", + "../browser/permission/permission_request_handler_unittest.cc", "../browser/renderer_host/auto_login_parser_unittest.cc", + "../browser/state_serializer_unittest.cc", "../browser/test/fake_window.cc", "../browser/test/fake_window.h", "../browser/test/rendering_test.cc", "../browser/test/rendering_test.h", - "../lib/main/webview_tests.cc", - "../native/address_parser_unittest.cc", - "../native/aw_contents_client_bridge_unittest.cc", - "../native/aw_media_url_interceptor_unittest.cc", - "../native/input_stream_unittest.cc", - "../native/permission/media_access_permission_request_unittest.cc", - "../native/permission/permission_request_handler_unittest.cc", - "../native/state_serializer_unittest.cc", + "../lib/webview_tests.cc", ] } |