OLD | NEW |
1 # Copyright 2015 The Chromium Authors. All rights reserved. | 1 # Copyright 2015 The Chromium Authors. All rights reserved. |
2 # Use of this source code is governed by a BSD-style license that can be | 2 # Use of this source code is governed by a BSD-style license that can be |
3 # found in the LICENSE file. | 3 # found in the LICENSE file. |
4 | 4 |
5 import("//build/config/android/rules.gni") | 5 import("//build/config/android/rules.gni") |
6 import("//testing/test.gni") | 6 import("//testing/test.gni") |
7 | 7 |
8 # Mark all targets as test only. | 8 # Mark all targets as test only. |
9 testonly = true | 9 testonly = true |
10 | 10 |
(...skipping 27 matching lines...) Expand all Loading... |
38 apk_under_test = ":system_webview_shell_apk" | 38 apk_under_test = ":system_webview_shell_apk" |
39 android_manifest = "PageCycler/AndroidManifest.xml" | 39 android_manifest = "PageCycler/AndroidManifest.xml" |
40 DEPRECATED_java_in_dir = "PageCycler/src" | 40 DEPRECATED_java_in_dir = "PageCycler/src" |
41 deps = [ | 41 deps = [ |
42 "//base:base_java", | 42 "//base:base_java", |
43 "//base:base_java_test_support", | 43 "//base:base_java_test_support", |
44 "//content/public/android:content_java", | 44 "//content/public/android:content_java", |
45 "//content/public/test/android:content_java_test_support", | 45 "//content/public/test/android:content_java_test_support", |
46 "//testing/android/reporter:reporter_java", | 46 "//testing/android/reporter:reporter_java", |
47 ] | 47 ] |
| 48 additional_apks = [ "//android_webview:system_webview_apk" ] |
48 } | 49 } |
49 | 50 |
50 # GYP: //android_webview/android_webview_shell.gypi:system_webview_shell_layout_
test_apk | 51 # GYP: //android_webview/android_webview_shell.gypi:system_webview_shell_layout_
test_apk |
51 instrumentation_test_apk("system_webview_shell_layout_test_apk") { | 52 instrumentation_test_apk("system_webview_shell_layout_test_apk") { |
52 apk_name = "SystemWebViewShellLayoutTest" | 53 apk_name = "SystemWebViewShellLayoutTest" |
53 apk_under_test = ":system_webview_shell_apk" | 54 apk_under_test = ":system_webview_shell_apk" |
54 android_manifest = "WebViewShellTest/AndroidManifest.xml" | 55 android_manifest = "WebViewShellTest/AndroidManifest.xml" |
55 DEPRECATED_java_in_dir = "WebViewShellTest/src" | 56 DEPRECATED_java_in_dir = "WebViewShellTest/src" |
56 isolate_file = "../system_webview_shell_test_apk.isolate" | 57 isolate_file = "../system_webview_shell_test_apk.isolate" |
57 deps = [ | 58 deps = [ |
58 "//base:base_java", | 59 "//base:base_java", |
59 "//base:base_java_test_support", | 60 "//base:base_java_test_support", |
60 "//testing/android/reporter:reporter_java", | 61 "//testing/android/reporter:reporter_java", |
61 ] | 62 ] |
| 63 additional_apks = [ "//android_webview:system_webview_apk" ] |
62 } | 64 } |
OLD | NEW |