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

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

Issue 1965583002: Move //webapk to //chrome/android/webapk (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 7 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') | webapk/OWNERS » ('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 134 matching lines...) Expand 10 before | Expand all | Expand 10 after
145 "javatests/src/org/chromium/content_shell_apk/ContentShellPreconditionsTest. java", 145 "javatests/src/org/chromium/content_shell_apk/ContentShellPreconditionsTest. java",
146 "javatests/src/org/chromium/content_shell_apk/ContentShellShellManagementTes t.java", 146 "javatests/src/org/chromium/content_shell_apk/ContentShellShellManagementTes t.java",
147 "javatests/src/org/chromium/content_shell_apk/ContentShellTestBase.java", 147 "javatests/src/org/chromium/content_shell_apk/ContentShellTestBase.java",
148 "javatests/src/org/chromium/content_shell_apk/ContentShellUrlTest.java", 148 "javatests/src/org/chromium/content_shell_apk/ContentShellUrlTest.java",
149 ] 149 ]
150 } 150 }
151 151
152 instrumentation_test_apk("content_shell_test_apk") { 152 instrumentation_test_apk("content_shell_test_apk") {
153 deps = [ 153 deps = [
154 "//base:base_javatests", 154 "//base:base_javatests",
155 "//chrome/android/webapk/shell_apk:shell_apk_javatests",
155 "//content/public/android:content_javatests", 156 "//content/public/android:content_javatests",
156 "//net/android:net_javatests", 157 "//net/android:net_javatests",
157 "//webapk/shell_apk:shell_apk_javatests",
158 ] 158 ]
159 data_deps = [ 159 data_deps = [
160 ":content_shell_apk", 160 ":content_shell_apk",
161 ] 161 ]
162 additional_apks = [ 162 additional_apks = [
163 "//webapk/shell_apk:webapk", 163 "//chrome/android/webapk/shell_apk:webapk",
164 "//webapk/shell_apk/javatests/dex_optimizer:dex_optimizer_apk", 164 "//chrome/android/webapk/shell_apk/javatests/dex_optimizer:dex_optimizer_apk ",
165 ] 165 ]
166 apk_under_test = ":content_shell_apk" 166 apk_under_test = ":content_shell_apk"
167 apk_name = "ContentShellTest" 167 apk_name = "ContentShellTest"
168 android_manifest = "javatests/AndroidManifest.xml" 168 android_manifest = "javatests/AndroidManifest.xml"
169 isolate_file = "../../content_shell_test_data.isolate" 169 isolate_file = "../../content_shell_test_data.isolate"
170 } 170 }
171 171
172 if (current_cpu != "x64") { 172 if (current_cpu != "x64") {
173 chromium_linker_test_manifest = 173 chromium_linker_test_manifest =
174 "$target_gen_dir/linker_test_apk/AndroidManifest.xml" 174 "$target_gen_dir/linker_test_apk/AndroidManifest.xml"
(...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after
248 testonly = true 248 testonly = true
249 deps = [ 249 deps = [
250 ":content_shell_java", 250 ":content_shell_java",
251 "//base:base_java", 251 "//base:base_java",
252 "//content/public/android:content_java", 252 "//content/public/android:content_java",
253 "//testing/android/native_test:native_test_java", 253 "//testing/android/native_test:native_test_java",
254 "//ui/android:ui_java", 254 "//ui/android:ui_java",
255 ] 255 ]
256 java_files = [ "browsertests/src/org/chromium/content_shell/browsertests/Conte ntShellBrowserTestActivity.java" ] 256 java_files = [ "browsertests/src/org/chromium/content_shell/browsertests/Conte ntShellBrowserTestActivity.java" ]
257 } 257 }
OLDNEW
« no previous file with comments | « content/public/android/BUILD.gn ('k') | webapk/OWNERS » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698