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

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

Issue 1094903008: Revert of [Android] Add an out-of-app instrumentation driver APK. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 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') | content/shell/android/javatests/AndroidManifest.xml » ('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/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 135 matching lines...) Expand 10 before | Expand all | Expand 10 after
146 ] 146 ]
147 DEPRECATED_java_in_dir = "javatests/src" 147 DEPRECATED_java_in_dir = "javatests/src"
148 } 148 }
149 149
150 android_apk("content_shell_test_apk") { 150 android_apk("content_shell_test_apk") {
151 testonly = true 151 testonly = true
152 deps = [ 152 deps = [
153 "//content/public/android:content_javatests", 153 "//content/public/android:content_javatests",
154 "//base:base_javatests", 154 "//base:base_javatests",
155 "//net/android:net_javatests", 155 "//net/android:net_javatests",
156 "//testing/android/broker:broker_java",
157 ] 156 ]
158 datadeps = [ 157 datadeps = [
159 ":content_shell_apk", 158 ":content_shell_apk",
160 "//testing/android/driver:driver_apk",
161 ] 159 ]
162 apk_under_test = ":content_shell_apk" 160 apk_under_test = ":content_shell_apk"
163 apk_name = "ContentShellTest" 161 apk_name = "ContentShellTest"
164 android_manifest = "javatests/AndroidManifest.xml" 162 android_manifest = "javatests/AndroidManifest.xml"
165 } 163 }
166 164
167 if (current_cpu != "x64" && current_cpu != "arm64") { 165 if (current_cpu != "x64" && current_cpu != "arm64") {
168 chromium_linker_test_manifest = 166 chromium_linker_test_manifest =
169 "$target_gen_dir/linker_test_apk/AndroidManifest.xml" 167 "$target_gen_dir/linker_test_apk/AndroidManifest.xml"
170 168
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
220 218
221 # GYP: //content/content_tests.gypi:chromium_android_linker_test_jni_headers 219 # GYP: //content/content_tests.gypi:chromium_android_linker_test_jni_headers
222 generate_jni("linker_test_jni_headers") { 220 generate_jni("linker_test_jni_headers") {
223 testonly = true 221 testonly = true
224 jni_package = "content/shell" 222 jni_package = "content/shell"
225 sources = [ 223 sources = [
226 "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",
227 ] 225 ]
228 } 226 }
229 } 227 }
OLDNEW
« no previous file with comments | « content/content_tests.gypi ('k') | content/shell/android/javatests/AndroidManifest.xml » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698