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 131 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
142 ":content_shell_apk_java", | 142 ":content_shell_apk_java", |
143 "//base:base_java", | 143 "//base:base_java", |
144 "//base:base_java_test_support", | 144 "//base:base_java_test_support", |
145 "//content/public/test/android:content_java_test_support", | 145 "//content/public/test/android:content_java_test_support", |
146 "//content/shell/android:content_shell_java", | 146 "//content/shell/android:content_shell_java", |
147 "//content/public/android:content_java", | 147 "//content/public/android:content_java", |
148 ] | 148 ] |
149 DEPRECATED_java_in_dir = "javatests/src" | 149 DEPRECATED_java_in_dir = "javatests/src" |
150 } | 150 } |
151 | 151 |
152 android_apk("content_shell_test_apk") { | 152 instrumentation_test_apk("content_shell_test_apk") { |
153 testonly = true | |
154 deps = [ | 153 deps = [ |
155 "//content/public/android:content_javatests", | 154 "//content/public/android:content_javatests", |
156 "//base:base_javatests", | 155 "//base:base_javatests", |
157 "//net/android:net_javatests", | 156 "//net/android:net_javatests", |
158 "//testing/android/broker:broker_java", | |
159 ] | 157 ] |
160 data_deps = [ | 158 data_deps = [ ":content_shell_apk" ] |
161 ":content_shell_apk", | |
162 "//testing/android/driver:driver_apk", | |
163 ] | |
164 apk_under_test = ":content_shell_apk" | 159 apk_under_test = ":content_shell_apk" |
165 apk_name = "ContentShellTest" | 160 apk_name = "ContentShellTest" |
166 android_manifest = "javatests/AndroidManifest.xml" | 161 android_manifest = "javatests/AndroidManifest.xml" |
| 162 isolate_file = "../../content_shell_test_apk.isolate" |
167 } | 163 } |
168 | 164 |
169 if (current_cpu != "x64" && current_cpu != "arm64") { | 165 if (current_cpu != "x64" && current_cpu != "arm64") { |
170 chromium_linker_test_manifest = | 166 chromium_linker_test_manifest = |
171 "$target_gen_dir/linker_test_apk/AndroidManifest.xml" | 167 "$target_gen_dir/linker_test_apk/AndroidManifest.xml" |
172 | 168 |
173 jinja_template("chromium_linker_test_manifest") { | 169 jinja_template("chromium_linker_test_manifest") { |
174 testonly = true | 170 testonly = true |
175 input = "linker_test_apk/AndroidManifest.xml.jinja2" | 171 input = "linker_test_apk/AndroidManifest.xml.jinja2" |
176 output = chromium_linker_test_manifest | 172 output = chromium_linker_test_manifest |
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
222 | 218 |
223 # GYP: //content/content_tests.gypi:chromium_android_linker_test_jni_headers | 219 # GYP: //content/content_tests.gypi:chromium_android_linker_test_jni_headers |
224 generate_jni("linker_test_jni_headers") { | 220 generate_jni("linker_test_jni_headers") { |
225 testonly = true | 221 testonly = true |
226 jni_package = "content/shell" | 222 jni_package = "content/shell" |
227 sources = [ | 223 sources = [ |
228 "linker_test_apk/src/org/chromium/chromium_linker_test_apk/LinkerTests.jav
a", | 224 "linker_test_apk/src/org/chromium/chromium_linker_test_apk/LinkerTests.jav
a", |
229 ] | 225 ] |
230 } | 226 } |
231 } | 227 } |
OLD | NEW |