| Index: android_webview/test/BUILD.gn
|
| diff --git a/android_webview/test/BUILD.gn b/android_webview/test/BUILD.gn
|
| index 0744657a8607579c22529826b7f83b730080acc3..01d4f82c049a22e12112a80db692e4c86be70b37 100644
|
| --- a/android_webview/test/BUILD.gn
|
| +++ b/android_webview/test/BUILD.gn
|
| @@ -10,9 +10,11 @@ testonly = true
|
|
|
| group("test") {
|
| deps = [
|
| - ":android_webview_test_apk",
|
| ":android_webview_unittests",
|
| ]
|
| + if (!enable_all_proguard_optimizations) {
|
| + deps += [ ":android_webview_test_apk" ]
|
| + }
|
| }
|
|
|
| # GYP: //android_webview/android_webview_tests.gypi:android_webview_apk
|
| @@ -97,113 +99,115 @@ shared_library("libstandalonelibwebviewchromium") {
|
| configs -= [ "//build/config/android:hide_native_jni_exports" ]
|
| }
|
|
|
| -# GYP: //android_webview/android_webview_tests.gypi:android_webview_test_apk
|
| -instrumentation_test_apk("android_webview_test_apk") {
|
| - apk_name = "AndroidWebViewTest"
|
| - apk_under_test = ":android_webview_apk"
|
| - android_manifest = "../javatests/AndroidManifest.xml"
|
| - deps = [
|
| - "//android_webview:android_webview_java",
|
| - "//base:base_java",
|
| - "//base:base_java_test_support",
|
| - "//components/external_video_surface:java",
|
| - "//components/policy/android:policy_java",
|
| - "//components/policy/android:policy_java_test_support",
|
| - "//components/web_contents_delegate_android:web_contents_delegate_android_java",
|
| - "//content/public/android:content_java",
|
| - "//content/public/test/android:content_java_test_support",
|
| - "//net/android:net_java",
|
| - "//net/android:net_java_test_support",
|
| - "//third_party/android_tools:legacy_http_javalib",
|
| - "//ui/android:ui_java",
|
| - ]
|
| - java_files = [
|
| - "../javatests/src/org/chromium/android_webview/test/AcceptLanguageTest.java",
|
| - "../javatests/src/org/chromium/android_webview/test/AndroidScrollIntegrationTest.java",
|
| - "../javatests/src/org/chromium/android_webview/test/AndroidViewIntegrationTest.java",
|
| - "../javatests/src/org/chromium/android_webview/test/ArchiveTest.java",
|
| - "../javatests/src/org/chromium/android_webview/test/AwContentsClientAutoLoginTest.java",
|
| - "../javatests/src/org/chromium/android_webview/test/AwContentsClientCallbackHelperTest.java",
|
| - "../javatests/src/org/chromium/android_webview/test/AwContentsClientFaviconTest.java",
|
| - "../javatests/src/org/chromium/android_webview/test/AwContentsClientFullScreenTest.java",
|
| - "../javatests/src/org/chromium/android_webview/test/AwContentsClientGetDefaultVideoPosterTest.java",
|
| - "../javatests/src/org/chromium/android_webview/test/AwContentsClientGetVideoLoadingProgressViewTest.java",
|
| - "../javatests/src/org/chromium/android_webview/test/AwContentsClientOnFormResubmissionTest.java",
|
| - "../javatests/src/org/chromium/android_webview/test/AwContentsClientOnScaleChangedTest.java",
|
| - "../javatests/src/org/chromium/android_webview/test/AwContentsClientShouldInterceptRequestTest.java",
|
| - "../javatests/src/org/chromium/android_webview/test/AwContentsClientShouldOverrideUrlLoadingTest.java",
|
| - "../javatests/src/org/chromium/android_webview/test/AwContentsClientVisitedHistoryTest.java",
|
| - "../javatests/src/org/chromium/android_webview/test/AwContentsGarbageCollectionTest.java",
|
| - "../javatests/src/org/chromium/android_webview/test/AwContentsLifecycleNotifierTest.java",
|
| - "../javatests/src/org/chromium/android_webview/test/AwContentsRenderTest.java",
|
| - "../javatests/src/org/chromium/android_webview/test/AwContentsStaticsTest.java",
|
| - "../javatests/src/org/chromium/android_webview/test/AwContentsTest.java",
|
| - "../javatests/src/org/chromium/android_webview/test/AwDebugTest.java",
|
| - "../javatests/src/org/chromium/android_webview/test/AwImeTest.java",
|
| - "../javatests/src/org/chromium/android_webview/test/AwJavaBridgeTest.java",
|
| - "../javatests/src/org/chromium/android_webview/test/AwLayoutSizerTest.java",
|
| - "../javatests/src/org/chromium/android_webview/test/AwLegacyQuirksTest.java",
|
| - "../javatests/src/org/chromium/android_webview/test/AwPermissionManagerTest.java",
|
| - "../javatests/src/org/chromium/android_webview/test/AwQuotaManagerBridgeTest.java",
|
| - "../javatests/src/org/chromium/android_webview/test/AwScrollOffsetManagerTest.java",
|
| - "../javatests/src/org/chromium/android_webview/test/AwSecondBrowserProcessTest.java",
|
| - "../javatests/src/org/chromium/android_webview/test/AwServiceWorkerClientTest.java",
|
| - "../javatests/src/org/chromium/android_webview/test/AwSettingsTest.java",
|
| - "../javatests/src/org/chromium/android_webview/test/AwTestBase.java",
|
| - "../javatests/src/org/chromium/android_webview/test/AwWebContentsObserverTest.java",
|
| - "../javatests/src/org/chromium/android_webview/test/AwZoomTest.java",
|
| - "../javatests/src/org/chromium/android_webview/test/ClearHistoryTest.java",
|
| - "../javatests/src/org/chromium/android_webview/test/ClientAddMessageToConsoleTest.java",
|
| - "../javatests/src/org/chromium/android_webview/test/ClientOnPageFinishedTest.java",
|
| - "../javatests/src/org/chromium/android_webview/test/ClientOnPageStartedTest.java",
|
| - "../javatests/src/org/chromium/android_webview/test/ClientOnReceivedError2Test.java",
|
| - "../javatests/src/org/chromium/android_webview/test/ClientOnReceivedErrorTest.java",
|
| - "../javatests/src/org/chromium/android_webview/test/ClientOnReceivedHttpErrorTest.java",
|
| - "../javatests/src/org/chromium/android_webview/test/ConsoleMessagesForBlockedLoadsTest.java",
|
| - "../javatests/src/org/chromium/android_webview/test/ContentViewMiscTest.java",
|
| - "../javatests/src/org/chromium/android_webview/test/CookieManagerStartupTest.java",
|
| - "../javatests/src/org/chromium/android_webview/test/CookieManagerTest.java",
|
| - "../javatests/src/org/chromium/android_webview/test/DisableHardwareAccelerationForTest.java",
|
| - "../javatests/src/org/chromium/android_webview/test/ExternalVideoSurfaceContainerTest.java",
|
| - "../javatests/src/org/chromium/android_webview/test/FullScreenVideoTestAwContentsClient.java",
|
| - "../javatests/src/org/chromium/android_webview/test/GeolocationTest.java",
|
| - "../javatests/src/org/chromium/android_webview/test/GetTitleTest.java",
|
| - "../javatests/src/org/chromium/android_webview/test/HttpAuthDatabaseTest.java",
|
| - "../javatests/src/org/chromium/android_webview/test/HttpCacheTest.java",
|
| - "../javatests/src/org/chromium/android_webview/test/KeySystemTest.java",
|
| - "../javatests/src/org/chromium/android_webview/test/LoadDataWithBaseUrlTest.java",
|
| - "../javatests/src/org/chromium/android_webview/test/LoadUrlTest.java",
|
| - "../javatests/src/org/chromium/android_webview/test/MediaAccessPermissionRequestTest.java",
|
| - "../javatests/src/org/chromium/android_webview/test/MultipleVideosTest.java",
|
| - "../javatests/src/org/chromium/android_webview/test/NavigationHistoryTest.java",
|
| - "../javatests/src/org/chromium/android_webview/test/PlatformMediaCodecTest.java",
|
| - "../javatests/src/org/chromium/android_webview/test/PolicyUrlFilteringTest.java",
|
| - "../javatests/src/org/chromium/android_webview/test/PopupWindowTest.java",
|
| - "../javatests/src/org/chromium/android_webview/test/PostMessageTest.java",
|
| - "../javatests/src/org/chromium/android_webview/test/SaveRestoreStateTest.java",
|
| - "../javatests/src/org/chromium/android_webview/test/StandaloneAwQuotaManagerBridgeTest.java",
|
| - "../javatests/src/org/chromium/android_webview/test/TestAwContentsClient.java",
|
| - "../javatests/src/org/chromium/android_webview/test/TestAwServiceWorkerClient.java",
|
| - "../javatests/src/org/chromium/android_webview/test/UserAgentTest.java",
|
| - "../javatests/src/org/chromium/android_webview/test/VisualStateTest.java",
|
| - "../javatests/src/org/chromium/android_webview/test/WebKitHitTestTest.java",
|
| - "../javatests/src/org/chromium/android_webview/test/WebViewAsynchronousFindApisTest.java",
|
| - "../javatests/src/org/chromium/android_webview/test/WebViewFindApisTestBase.java",
|
| - "../javatests/src/org/chromium/android_webview/test/WebViewModalDialogOverrideTest.java",
|
| - "../javatests/src/org/chromium/android_webview/test/util/AwQuotaManagerBridgeTestUtil.java",
|
| - "../javatests/src/org/chromium/android_webview/test/util/AwTestTouchUtils.java",
|
| - "../javatests/src/org/chromium/android_webview/test/util/CommonResources.java",
|
| - "../javatests/src/org/chromium/android_webview/test/util/CookieUtils.java",
|
| - "../javatests/src/org/chromium/android_webview/test/util/GraphicsTestUtils.java",
|
| - "../javatests/src/org/chromium/android_webview/test/util/ImagePageGenerator.java",
|
| - "../javatests/src/org/chromium/android_webview/test/util/JSUtils.java",
|
| - "../javatests/src/org/chromium/android_webview/test/util/JavascriptEventObserver.java",
|
| - "../javatests/src/org/chromium/android_webview/test/util/VideoSurfaceViewUtils.java",
|
| - "../javatests/src/org/chromium/android_webview/test/util/VideoTestUtil.java",
|
| - "../javatests/src/org/chromium/android_webview/test/util/VideoTestWebServer.java",
|
| - ]
|
| - isolate_file = "../android_webview_test_data.isolate"
|
| - additional_apks = [ "//net/android:net_test_support_apk" ]
|
| +if (!enable_all_proguard_optimizations) {
|
| + # GYP: //android_webview/android_webview_tests.gypi:android_webview_test_apk
|
| + instrumentation_test_apk("android_webview_test_apk") {
|
| + apk_name = "AndroidWebViewTest"
|
| + apk_under_test = ":android_webview_apk"
|
| + android_manifest = "../javatests/AndroidManifest.xml"
|
| + deps = [
|
| + "//android_webview:android_webview_java",
|
| + "//base:base_java",
|
| + "//base:base_java_test_support",
|
| + "//components/external_video_surface:java",
|
| + "//components/policy/android:policy_java",
|
| + "//components/policy/android:policy_java_test_support",
|
| + "//components/web_contents_delegate_android:web_contents_delegate_android_java",
|
| + "//content/public/android:content_java",
|
| + "//content/public/test/android:content_java_test_support",
|
| + "//net/android:net_java",
|
| + "//net/android:net_java_test_support",
|
| + "//third_party/android_tools:legacy_http_javalib",
|
| + "//ui/android:ui_java",
|
| + ]
|
| + java_files = [
|
| + "../javatests/src/org/chromium/android_webview/test/AcceptLanguageTest.java",
|
| + "../javatests/src/org/chromium/android_webview/test/AndroidScrollIntegrationTest.java",
|
| + "../javatests/src/org/chromium/android_webview/test/AndroidViewIntegrationTest.java",
|
| + "../javatests/src/org/chromium/android_webview/test/ArchiveTest.java",
|
| + "../javatests/src/org/chromium/android_webview/test/AwContentsClientAutoLoginTest.java",
|
| + "../javatests/src/org/chromium/android_webview/test/AwContentsClientCallbackHelperTest.java",
|
| + "../javatests/src/org/chromium/android_webview/test/AwContentsClientFaviconTest.java",
|
| + "../javatests/src/org/chromium/android_webview/test/AwContentsClientFullScreenTest.java",
|
| + "../javatests/src/org/chromium/android_webview/test/AwContentsClientGetDefaultVideoPosterTest.java",
|
| + "../javatests/src/org/chromium/android_webview/test/AwContentsClientGetVideoLoadingProgressViewTest.java",
|
| + "../javatests/src/org/chromium/android_webview/test/AwContentsClientOnFormResubmissionTest.java",
|
| + "../javatests/src/org/chromium/android_webview/test/AwContentsClientOnScaleChangedTest.java",
|
| + "../javatests/src/org/chromium/android_webview/test/AwContentsClientShouldInterceptRequestTest.java",
|
| + "../javatests/src/org/chromium/android_webview/test/AwContentsClientShouldOverrideUrlLoadingTest.java",
|
| + "../javatests/src/org/chromium/android_webview/test/AwContentsClientVisitedHistoryTest.java",
|
| + "../javatests/src/org/chromium/android_webview/test/AwContentsGarbageCollectionTest.java",
|
| + "../javatests/src/org/chromium/android_webview/test/AwContentsLifecycleNotifierTest.java",
|
| + "../javatests/src/org/chromium/android_webview/test/AwContentsRenderTest.java",
|
| + "../javatests/src/org/chromium/android_webview/test/AwContentsStaticsTest.java",
|
| + "../javatests/src/org/chromium/android_webview/test/AwContentsTest.java",
|
| + "../javatests/src/org/chromium/android_webview/test/AwDebugTest.java",
|
| + "../javatests/src/org/chromium/android_webview/test/AwImeTest.java",
|
| + "../javatests/src/org/chromium/android_webview/test/AwJavaBridgeTest.java",
|
| + "../javatests/src/org/chromium/android_webview/test/AwLayoutSizerTest.java",
|
| + "../javatests/src/org/chromium/android_webview/test/AwLegacyQuirksTest.java",
|
| + "../javatests/src/org/chromium/android_webview/test/AwPermissionManagerTest.java",
|
| + "../javatests/src/org/chromium/android_webview/test/AwQuotaManagerBridgeTest.java",
|
| + "../javatests/src/org/chromium/android_webview/test/AwScrollOffsetManagerTest.java",
|
| + "../javatests/src/org/chromium/android_webview/test/AwSecondBrowserProcessTest.java",
|
| + "../javatests/src/org/chromium/android_webview/test/AwServiceWorkerClientTest.java",
|
| + "../javatests/src/org/chromium/android_webview/test/AwSettingsTest.java",
|
| + "../javatests/src/org/chromium/android_webview/test/AwTestBase.java",
|
| + "../javatests/src/org/chromium/android_webview/test/AwWebContentsObserverTest.java",
|
| + "../javatests/src/org/chromium/android_webview/test/AwZoomTest.java",
|
| + "../javatests/src/org/chromium/android_webview/test/ClearHistoryTest.java",
|
| + "../javatests/src/org/chromium/android_webview/test/ClientAddMessageToConsoleTest.java",
|
| + "../javatests/src/org/chromium/android_webview/test/ClientOnPageFinishedTest.java",
|
| + "../javatests/src/org/chromium/android_webview/test/ClientOnPageStartedTest.java",
|
| + "../javatests/src/org/chromium/android_webview/test/ClientOnReceivedError2Test.java",
|
| + "../javatests/src/org/chromium/android_webview/test/ClientOnReceivedErrorTest.java",
|
| + "../javatests/src/org/chromium/android_webview/test/ClientOnReceivedHttpErrorTest.java",
|
| + "../javatests/src/org/chromium/android_webview/test/ConsoleMessagesForBlockedLoadsTest.java",
|
| + "../javatests/src/org/chromium/android_webview/test/ContentViewMiscTest.java",
|
| + "../javatests/src/org/chromium/android_webview/test/CookieManagerStartupTest.java",
|
| + "../javatests/src/org/chromium/android_webview/test/CookieManagerTest.java",
|
| + "../javatests/src/org/chromium/android_webview/test/DisableHardwareAccelerationForTest.java",
|
| + "../javatests/src/org/chromium/android_webview/test/ExternalVideoSurfaceContainerTest.java",
|
| + "../javatests/src/org/chromium/android_webview/test/FullScreenVideoTestAwContentsClient.java",
|
| + "../javatests/src/org/chromium/android_webview/test/GeolocationTest.java",
|
| + "../javatests/src/org/chromium/android_webview/test/GetTitleTest.java",
|
| + "../javatests/src/org/chromium/android_webview/test/HttpAuthDatabaseTest.java",
|
| + "../javatests/src/org/chromium/android_webview/test/HttpCacheTest.java",
|
| + "../javatests/src/org/chromium/android_webview/test/KeySystemTest.java",
|
| + "../javatests/src/org/chromium/android_webview/test/LoadDataWithBaseUrlTest.java",
|
| + "../javatests/src/org/chromium/android_webview/test/LoadUrlTest.java",
|
| + "../javatests/src/org/chromium/android_webview/test/MediaAccessPermissionRequestTest.java",
|
| + "../javatests/src/org/chromium/android_webview/test/MultipleVideosTest.java",
|
| + "../javatests/src/org/chromium/android_webview/test/NavigationHistoryTest.java",
|
| + "../javatests/src/org/chromium/android_webview/test/PlatformMediaCodecTest.java",
|
| + "../javatests/src/org/chromium/android_webview/test/PolicyUrlFilteringTest.java",
|
| + "../javatests/src/org/chromium/android_webview/test/PopupWindowTest.java",
|
| + "../javatests/src/org/chromium/android_webview/test/PostMessageTest.java",
|
| + "../javatests/src/org/chromium/android_webview/test/SaveRestoreStateTest.java",
|
| + "../javatests/src/org/chromium/android_webview/test/StandaloneAwQuotaManagerBridgeTest.java",
|
| + "../javatests/src/org/chromium/android_webview/test/TestAwContentsClient.java",
|
| + "../javatests/src/org/chromium/android_webview/test/TestAwServiceWorkerClient.java",
|
| + "../javatests/src/org/chromium/android_webview/test/UserAgentTest.java",
|
| + "../javatests/src/org/chromium/android_webview/test/VisualStateTest.java",
|
| + "../javatests/src/org/chromium/android_webview/test/WebKitHitTestTest.java",
|
| + "../javatests/src/org/chromium/android_webview/test/WebViewAsynchronousFindApisTest.java",
|
| + "../javatests/src/org/chromium/android_webview/test/WebViewFindApisTestBase.java",
|
| + "../javatests/src/org/chromium/android_webview/test/WebViewModalDialogOverrideTest.java",
|
| + "../javatests/src/org/chromium/android_webview/test/util/AwQuotaManagerBridgeTestUtil.java",
|
| + "../javatests/src/org/chromium/android_webview/test/util/AwTestTouchUtils.java",
|
| + "../javatests/src/org/chromium/android_webview/test/util/CommonResources.java",
|
| + "../javatests/src/org/chromium/android_webview/test/util/CookieUtils.java",
|
| + "../javatests/src/org/chromium/android_webview/test/util/GraphicsTestUtils.java",
|
| + "../javatests/src/org/chromium/android_webview/test/util/ImagePageGenerator.java",
|
| + "../javatests/src/org/chromium/android_webview/test/util/JSUtils.java",
|
| + "../javatests/src/org/chromium/android_webview/test/util/JavascriptEventObserver.java",
|
| + "../javatests/src/org/chromium/android_webview/test/util/VideoSurfaceViewUtils.java",
|
| + "../javatests/src/org/chromium/android_webview/test/util/VideoTestUtil.java",
|
| + "../javatests/src/org/chromium/android_webview/test/util/VideoTestWebServer.java",
|
| + ]
|
| + isolate_file = "../android_webview_test_data.isolate"
|
| + additional_apks = [ "//net/android:net_test_support_apk" ]
|
| + }
|
| }
|
|
|
| # GYP: //android_webview/android_webview_tests.gypi:android_webview_unittests
|
|
|