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

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

Issue 1920753002: Make content_shell_test fit isolate naming convention. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Also update bb_device_steps.py. Created 4 years, 8 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/content_tests.gypi ('k') | no next file » | 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 142 matching lines...) Expand 10 before | Expand all | Expand 10 after
153 "//base:base_javatests", 153 "//base:base_javatests",
154 "//content/public/android:content_javatests", 154 "//content/public/android:content_javatests",
155 "//net/android:net_javatests", 155 "//net/android:net_javatests",
156 ] 156 ]
157 data_deps = [ 157 data_deps = [
158 ":content_shell_apk", 158 ":content_shell_apk",
159 ] 159 ]
160 apk_under_test = ":content_shell_apk" 160 apk_under_test = ":content_shell_apk"
161 apk_name = "ContentShellTest" 161 apk_name = "ContentShellTest"
162 android_manifest = "javatests/AndroidManifest.xml" 162 android_manifest = "javatests/AndroidManifest.xml"
163 isolate_file = "../../content_shell_test_apk.isolate" 163 isolate_file = "../../content_shell_test_data.isolate"
164 } 164 }
165 165
166 if (current_cpu != "x64") { 166 if (current_cpu != "x64") {
167 chromium_linker_test_manifest = 167 chromium_linker_test_manifest =
168 "$target_gen_dir/linker_test_apk/AndroidManifest.xml" 168 "$target_gen_dir/linker_test_apk/AndroidManifest.xml"
169 169
170 jinja_template("chromium_linker_test_manifest") { 170 jinja_template("chromium_linker_test_manifest") {
171 testonly = true 171 testonly = true
172 input = "linker_test_apk/AndroidManifest.xml.jinja2" 172 input = "linker_test_apk/AndroidManifest.xml.jinja2"
173 output = chromium_linker_test_manifest 173 output = chromium_linker_test_manifest
(...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after
242 testonly = true 242 testonly = true
243 deps = [ 243 deps = [
244 ":content_shell_java", 244 ":content_shell_java",
245 "//base:base_java", 245 "//base:base_java",
246 "//content/public/android:content_java", 246 "//content/public/android:content_java",
247 "//testing/android/native_test:native_test_java", 247 "//testing/android/native_test:native_test_java",
248 "//ui/android:ui_java", 248 "//ui/android:ui_java",
249 ] 249 ]
250 java_files = [ "browsertests/src/org/chromium/content_shell/browsertests/Conte ntShellBrowserTestActivity.java" ] 250 java_files = [ "browsertests/src/org/chromium/content_shell/browsertests/Conte ntShellBrowserTestActivity.java" ]
251 } 251 }
OLDNEW
« no previous file with comments | « content/content_tests.gypi ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698