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

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

Issue 2536373005: Add --test-jar arg to test_runner to explicitly specify its path. (Closed)
Patch Set: Added required=True Created 4 years 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 | « build/android/test_runner.py ('k') | build/config/android/rules.gni » ('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 # Do not add any imports to non-//build directories here. 5 # Do not add any imports to non-//build directories here.
6 # Some projects (e.g. V8) do not have non-build directories DEPS'ed in. 6 # Some projects (e.g. V8) do not have non-build directories DEPS'ed in.
7 import("//build_overrides/build.gni") 7 import("//build_overrides/build.gni")
8 import("//build/config/android/config.gni") 8 import("//build/config/android/config.gni")
9 import("//build/config/dcheck_always_on.gni") 9 import("//build/config/dcheck_always_on.gni")
10 import("//build/config/sanitizers/sanitizers.gni") 10 import("//build/config/sanitizers/sanitizers.gni")
(...skipping 496 matching lines...) Expand 10 before | Expand all | Expand 10 after
507 assert(defined(invoker.test_suite)) 507 assert(defined(invoker.test_suite))
508 test_runner_args += [ 508 test_runner_args += [
509 "--suite", 509 "--suite",
510 invoker.test_suite, 510 invoker.test_suite,
511 ] 511 ]
512 } else if (_test_type == "instrumentation") { 512 } else if (_test_type == "instrumentation") {
513 _test_apk = "@FileArg($_rebased_apk_build_config:deps_info:apk_path)" 513 _test_apk = "@FileArg($_rebased_apk_build_config:deps_info:apk_path)"
514 if (_incremental_install) { 514 if (_incremental_install) {
515 _test_apk = "@FileArg($_rebased_apk_build_config:deps_info:incremental_a pk_path)" 515 _test_apk = "@FileArg($_rebased_apk_build_config:deps_info:incremental_a pk_path)"
516 } 516 }
517 test_runner_args += [ "--test-apk=$_test_apk" ] 517 test_runner_args += [
518 "--test-apk=$_test_apk",
519 "--test-jar",
520 rebase_path(invoker.test_jar, root_build_dir),
521 ]
518 if (defined(invoker.apk_under_test)) { 522 if (defined(invoker.apk_under_test)) {
519 deps += [ "${invoker.apk_under_test}__build_config" ] 523 deps += [ "${invoker.apk_under_test}__build_config" ]
520 _apk_under_test_build_config = 524 _apk_under_test_build_config =
521 get_label_info(invoker.apk_under_test, "target_gen_dir") + "/" + 525 get_label_info(invoker.apk_under_test, "target_gen_dir") + "/" +
522 get_label_info(invoker.apk_under_test, "name") + ".build_config" 526 get_label_info(invoker.apk_under_test, "name") + ".build_config"
523 _rebased_apk_under_test_build_config = 527 _rebased_apk_under_test_build_config =
524 rebase_path(_apk_under_test_build_config, root_build_dir) 528 rebase_path(_apk_under_test_build_config, root_build_dir)
525 _apk_under_test = 529 _apk_under_test =
526 "@FileArg($_rebased_apk_under_test_build_config:deps_info:apk_path)" 530 "@FileArg($_rebased_apk_under_test_build_config:deps_info:apk_path)"
527 if (_incremental_install) { 531 if (_incremental_install) {
(...skipping 2202 matching lines...) Expand 10 before | Expand all | Expand 10 after
2730 rebase_path(root_build_dir, root_build_dir), 2734 rebase_path(root_build_dir, root_build_dir),
2731 "--packed-libraries-dir", 2735 "--packed-libraries-dir",
2732 rebase_path(_packed_libraries_dir, root_build_dir), 2736 rebase_path(_packed_libraries_dir, root_build_dir),
2733 "--libraries=${invoker.libraries_filearg}", 2737 "--libraries=${invoker.libraries_filearg}",
2734 "--filelistjson", 2738 "--filelistjson",
2735 rebase_path(invoker.file_list_json, root_build_dir), 2739 rebase_path(invoker.file_list_json, root_build_dir),
2736 ] 2740 ]
2737 } 2741 }
2738 } 2742 }
2739 } 2743 }
OLDNEW
« no previous file with comments | « build/android/test_runner.py ('k') | build/config/android/rules.gni » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698