Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(365)

Side by Side Diff: content/shell/android/BUILD.gn

Issue 2203073002: [Android] Switch instrumentation tests to generated device isolates. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@move-isolate-generation
Patch Set: rebase 2 Created 4 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « content/public/android/BUILD.gn ('k') | mojo/android/BUILD.gn » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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_overrides/v8.gni") 7 import("//build_overrides/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 141 matching lines...) Expand 10 before | Expand all | Expand 10 after
152 "javatests/src/org/chromium/content_shell_apk/ContentShellUrlTest.java", 152 "javatests/src/org/chromium/content_shell_apk/ContentShellUrlTest.java",
153 ] 153 ]
154 } 154 }
155 155
156 instrumentation_test_apk("content_shell_test_apk") { 156 instrumentation_test_apk("content_shell_test_apk") {
157 deps = [ 157 deps = [
158 "//base:base_javatests", 158 "//base:base_javatests",
159 "//content/public/android:content_javatests", 159 "//content/public/android:content_javatests",
160 "//net/android:net_javatests", 160 "//net/android:net_javatests",
161 ] 161 ]
162 data_deps = [
163 ":content_shell_apk",
164 ]
165 apk_under_test = ":content_shell_apk" 162 apk_under_test = ":content_shell_apk"
166 apk_name = "ContentShellTest" 163 apk_name = "ContentShellTest"
167 android_manifest = "javatests/AndroidManifest.xml" 164 android_manifest = "javatests/AndroidManifest.xml"
168 isolate_file = "../../content_shell_test_data.isolate"
169 } 165 }
170 166
171 if (current_cpu != "x64") { 167 if (current_cpu != "x64") {
172 chromium_linker_test_manifest = 168 chromium_linker_test_manifest =
173 "$target_gen_dir/linker_test_apk/AndroidManifest.xml" 169 "$target_gen_dir/linker_test_apk/AndroidManifest.xml"
174 170
175 jinja_template("chromium_linker_test_manifest") { 171 jinja_template("chromium_linker_test_manifest") {
176 testonly = true 172 testonly = true
177 input = "linker_test_apk/AndroidManifest.xml.jinja2" 173 input = "linker_test_apk/AndroidManifest.xml.jinja2"
178 output = chromium_linker_test_manifest 174 output = chromium_linker_test_manifest
(...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after
244 testonly = true 240 testonly = true
245 deps = [ 241 deps = [
246 ":content_shell_java", 242 ":content_shell_java",
247 "//base:base_java", 243 "//base:base_java",
248 "//content/public/android:content_java", 244 "//content/public/android:content_java",
249 "//testing/android/native_test:native_test_java", 245 "//testing/android/native_test:native_test_java",
250 "//ui/android:ui_java", 246 "//ui/android:ui_java",
251 ] 247 ]
252 java_files = [ "browsertests/src/org/chromium/content_shell/browsertests/Conte ntShellBrowserTestActivity.java" ] 248 java_files = [ "browsertests/src/org/chromium/content_shell/browsertests/Conte ntShellBrowserTestActivity.java" ]
253 } 249 }
OLDNEW
« no previous file with comments | « content/public/android/BUILD.gn ('k') | mojo/android/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698