| Index: android_webview/tools/automated_ui_tests/BUILD.gn
|
| diff --git a/android_webview/tools/automated_ui_tests/BUILD.gn b/android_webview/tools/automated_ui_tests/BUILD.gn
|
| index 4b8b57814146764100724f5dd00ebf79badff2d9..37a7aa468118f8a78411f54c00d30c40e1199c5e 100644
|
| --- a/android_webview/tools/automated_ui_tests/BUILD.gn
|
| +++ b/android_webview/tools/automated_ui_tests/BUILD.gn
|
| @@ -9,8 +9,10 @@ group("webview_ui_test_app") {
|
| testonly = true
|
| deps = [
|
| ":webview_ui_test_app_apk",
|
| - ":webview_ui_test_app_test_apk",
|
| ]
|
| + if (!enable_all_proguard_optimizations) {
|
| + deps += [ ":webview_ui_test_app_test_apk" ]
|
| + }
|
| }
|
|
|
| android_apk("webview_ui_test_app_apk") {
|
| @@ -36,20 +38,22 @@ android_resources("webview_ui_test_app_apk_resources") {
|
| custom_package = "org.chromium.webview_ui_test"
|
| }
|
|
|
| -instrumentation_test_apk("webview_ui_test_app_test_apk") {
|
| - apk_name = "WebViewUiTestAppTest"
|
| - android_manifest = "javatests/AndroidManifest.xml"
|
| - java_files = [
|
| - "javatests/src/org/chromium/webview_ui_test/test/LoadDataTest.java",
|
| - "javatests/src/org/chromium/webview_ui_test/test/WebViewTestBase.java",
|
| - ]
|
| - deps = [
|
| - ":webview_ui_test_app_apk_resources",
|
| - ":webview_ui_test_app_java",
|
| - "//third_party/ub-uiautomator:ub_uiautomator_java",
|
| - ]
|
| - data_deps = [
|
| - ":webview_ui_test_app_apk",
|
| - ]
|
| - apk_under_test = ":webview_ui_test_app_apk"
|
| +if (!enable_all_proguard_optimizations) {
|
| + instrumentation_test_apk("webview_ui_test_app_test_apk") {
|
| + apk_name = "WebViewUiTestAppTest"
|
| + android_manifest = "javatests/AndroidManifest.xml"
|
| + java_files = [
|
| + "javatests/src/org/chromium/webview_ui_test/test/LoadDataTest.java",
|
| + "javatests/src/org/chromium/webview_ui_test/test/WebViewTestBase.java",
|
| + ]
|
| + deps = [
|
| + ":webview_ui_test_app_apk_resources",
|
| + ":webview_ui_test_app_java",
|
| + "//third_party/ub-uiautomator:ub_uiautomator_java",
|
| + ]
|
| + data_deps = [
|
| + ":webview_ui_test_app_apk",
|
| + ]
|
| + apk_under_test = ":webview_ui_test_app_apk"
|
| + }
|
| }
|
|
|