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

Side by Side Diff: build/config/android/rules.gni

Issue 2233613002: [Android] Remove vestigial isolate_file logic from instrumentation_test_apk. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Remove unused gypi_to_gn invocation. 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 | « no previous file | 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/internal_rules.gni") 6 import("//build/config/android/internal_rules.gni")
7 import("//build/config/dcheck_always_on.gni") 7 import("//build/config/dcheck_always_on.gni")
8 import("//build/toolchain/toolchain.gni") 8 import("//build/toolchain/toolchain.gni")
9 9
10 assert(is_android) 10 assert(is_android)
(...skipping 2221 matching lines...) Expand 10 before | Expand all | Expand 10 after
2232 # java_files: List of .java files to include in the apk. 2232 # java_files: List of .java files to include in the apk.
2233 # srcjar_deps: List of srcjar dependencies. The .java files in the srcjars 2233 # srcjar_deps: List of srcjar dependencies. The .java files in the srcjars
2234 # will be added to java_files and be included in this apk. 2234 # will be added to java_files and be included in this apk.
2235 # apk_name: Name for final apk. 2235 # apk_name: Name for final apk.
2236 # final_apk_path: Path to final built apk. Default is 2236 # final_apk_path: Path to final built apk. Default is
2237 # $root_out_dir/apks/$apk_name.apk. Setting this will override apk_name. 2237 # $root_out_dir/apks/$apk_name.apk. Setting this will override apk_name.
2238 # shared_libraries: List shared_library targets to bundle. If these 2238 # shared_libraries: List shared_library targets to bundle. If these
2239 # libraries depend on other shared_library targets, those dependencies wil l 2239 # libraries depend on other shared_library targets, those dependencies wil l
2240 # also be included in the apk (e.g. for is_component_build). 2240 # also be included in the apk (e.g. for is_component_build).
2241 # apk_under_test: The apk being tested. 2241 # apk_under_test: The apk being tested.
2242 # isolate_file: Isolate file containing the list of test data dependencies.
2243 # 2242 #
2244 # Example 2243 # Example
2245 # instrumentation_test_apk("foo_test_apk") { 2244 # instrumentation_test_apk("foo_test_apk") {
2246 # android_manifest = "AndroidManifest.xml" 2245 # android_manifest = "AndroidManifest.xml"
2247 # apk_name = "FooTest" 2246 # apk_name = "FooTest"
2248 # apk_under_test = "Foo" 2247 # apk_under_test = "Foo"
2249 # java_files = [ 2248 # java_files = [
2250 # "android/org/chromium/foo/FooTestCase.java", 2249 # "android/org/chromium/foo/FooTestCase.java",
2251 # "android/org/chromium/foo/FooExampleTest.java", 2250 # "android/org/chromium/foo/FooExampleTest.java",
2252 # ] 2251 # ]
(...skipping 14 matching lines...) Expand all
2267 forward_variables_from(invoker, 2266 forward_variables_from(invoker,
2268 [ 2267 [
2269 "data", 2268 "data",
2270 "data_deps", 2269 "data_deps",
2271 "deps", 2270 "deps",
2272 "public_deps", 2271 "public_deps",
2273 ]) 2272 ])
2274 output = _device_isolate_path 2273 output = _device_isolate_path
2275 } 2274 }
2276 2275
2277 if (defined(invoker.isolate_file)) {
2278 assert(invoker.isolate_file != "")
2279 }
2280
2281 test_runner_script(_test_runner_target_name) { 2276 test_runner_script(_test_runner_target_name) {
2282 forward_variables_from(invoker, 2277 forward_variables_from(invoker,
2283 [ 2278 [
2284 "additional_apks", 2279 "additional_apks",
2285 "apk_under_test", 2280 "apk_under_test",
2286 ]) 2281 ])
2287 test_name = invoker.target_name 2282 test_name = invoker.target_name
2288 test_type = "instrumentation" 2283 test_type = "instrumentation"
2289 apk_target = ":$_apk_target_name" 2284 apk_target = ":$_apk_target_name"
2290 isolate_file = _device_isolate_path 2285 isolate_file = _device_isolate_path
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
2345 public_deps = [ 2340 public_deps = [
2346 ":$_apk_target_name", 2341 ":$_apk_target_name",
2347 ":$_test_runner_target_name", 2342 ":$_test_runner_target_name",
2348 2343
2349 # Required by test runner to enumerate test list. 2344 # Required by test runner to enumerate test list.
2350 ":${_apk_target_name}_dist_ijar", 2345 ":${_apk_target_name}_dist_ijar",
2351 ] 2346 ]
2352 if (defined(invoker.apk_under_test)) { 2347 if (defined(invoker.apk_under_test)) {
2353 public_deps += [ invoker.apk_under_test ] 2348 public_deps += [ invoker.apk_under_test ]
2354 } 2349 }
2355 if (defined(invoker.isolate_file)) {
2356 isolate_values = exec_script("//build/gypi_to_gn.py",
2357 [
2358 rebase_path(invoker.isolate_file),
2359 "--replace",
2360 "<(DEPTH)=/",
2361 ],
2362 "scope",
2363 [ invoker.isolate_file ])
2364 data = isolate_values.files
2365 }
2366 } 2350 }
2367 2351
2368 # TODO: Delete once recipes no longer use this target. 2352 # TODO: Delete once recipes no longer use this target.
2369 group("${target_name}_run") { 2353 group("${target_name}_run") {
2370 public_deps = [ 2354 public_deps = [
2371 ":${invoker.target_name}", 2355 ":${invoker.target_name}",
2372 ] 2356 ]
2373 } 2357 }
2374 group("${target_name}_incremental") { 2358 group("${target_name}_incremental") {
2375 public_deps = [ 2359 public_deps = [
(...skipping 334 matching lines...) Expand 10 before | Expand all | Expand 10 after
2710 supports_android = true 2694 supports_android = true
2711 jar_path = "${_output_path}/$jar" 2695 jar_path = "${_output_path}/$jar"
2712 } 2696 }
2713 } 2697 }
2714 2698
2715 java_group(target_name) { 2699 java_group(target_name) {
2716 deps = _resource_targets + _jar_targets 2700 deps = _resource_targets + _jar_targets
2717 } 2701 }
2718 } 2702 }
2719 } 2703 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698