OLD | NEW |
1 # Copyright 2014 The Chromium Authors. All rights reserved. | 1 # Copyright 2014 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/config.gni") | 5 import("//build/config/android/config.gni") |
6 import("//build/config/android/rules.gni") | 6 import("//build/config/android/rules.gni") |
7 import("//build/module_args/v8.gni") | 7 import("//build/module_args/v8.gni") |
8 import("//third_party/icu/config.gni") | 8 import("//third_party/icu/config.gni") |
9 | 9 |
10 generate_jni("content_shell_jni_headers") { | 10 generate_jni("content_shell_jni_headers") { |
(...skipping 128 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
139 ":content_shell_apk_java", | 139 ":content_shell_apk_java", |
140 "//base:base_java", | 140 "//base:base_java", |
141 "//base:base_java_test_support", | 141 "//base:base_java_test_support", |
142 "//content/public/test/android:content_java_test_support", | 142 "//content/public/test/android:content_java_test_support", |
143 "//content/shell/android:content_shell_java", | 143 "//content/shell/android:content_shell_java", |
144 "//content/public/android:content_java", | 144 "//content/public/android:content_java", |
145 ] | 145 ] |
146 DEPRECATED_java_in_dir = "javatests/src" | 146 DEPRECATED_java_in_dir = "javatests/src" |
147 } | 147 } |
148 | 148 |
149 android_apk("content_shell_test_apk") { | 149 instrumentation_test_apk("content_shell_test_apk") { |
150 testonly = true | |
151 deps = [ | 150 deps = [ |
152 "//content/public/android:content_javatests", | 151 "//content/public/android:content_javatests", |
153 "//base:base_javatests", | 152 "//base:base_javatests", |
154 "//net/android:net_javatests", | 153 "//net/android:net_javatests", |
155 "//testing/android/broker:broker_java", | |
156 ] | 154 ] |
157 datadeps = [ | 155 datadeps = [ |
158 ":content_shell_apk", | 156 ":content_shell_apk", |
159 "//testing/android/driver:driver_apk", | |
160 ] | 157 ] |
161 apk_under_test = ":content_shell_apk" | 158 apk_under_test = ":content_shell_apk" |
162 apk_name = "ContentShellTest" | 159 apk_name = "ContentShellTest" |
163 android_manifest = "javatests/AndroidManifest.xml" | 160 android_manifest = "javatests/AndroidManifest.xml" |
| 161 isolate_file = "../../content_shell_test_apk.isolate" |
164 } | 162 } |
165 | 163 |
166 if (current_cpu != "x64" && current_cpu != "arm64") { | 164 if (current_cpu != "x64" && current_cpu != "arm64") { |
167 chromium_linker_test_manifest = | 165 chromium_linker_test_manifest = |
168 "$target_gen_dir/linker_test_apk/AndroidManifest.xml" | 166 "$target_gen_dir/linker_test_apk/AndroidManifest.xml" |
169 | 167 |
170 jinja_template("chromium_linker_test_manifest") { | 168 jinja_template("chromium_linker_test_manifest") { |
171 testonly = true | 169 testonly = true |
172 input = "linker_test_apk/AndroidManifest.xml.jinja2" | 170 input = "linker_test_apk/AndroidManifest.xml.jinja2" |
173 output = chromium_linker_test_manifest | 171 output = chromium_linker_test_manifest |
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
219 | 217 |
220 # GYP: //content/content_tests.gypi:chromium_android_linker_test_jni_headers | 218 # GYP: //content/content_tests.gypi:chromium_android_linker_test_jni_headers |
221 generate_jni("linker_test_jni_headers") { | 219 generate_jni("linker_test_jni_headers") { |
222 testonly = true | 220 testonly = true |
223 jni_package = "content/shell" | 221 jni_package = "content/shell" |
224 sources = [ | 222 sources = [ |
225 "linker_test_apk/src/org/chromium/chromium_linker_test_apk/LinkerTests.jav
a", | 223 "linker_test_apk/src/org/chromium/chromium_linker_test_apk/LinkerTests.jav
a", |
226 ] | 224 ] |
227 } | 225 } |
228 } | 226 } |
OLD | NEW |