| OLD | NEW |
| 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 298 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 309 defined(invoker.incremental_allowed) && invoker.incremental_allowed | 309 defined(invoker.incremental_allowed) && invoker.incremental_allowed |
| 310 args += [ "--apk-path=$_rebased_apk_path" ] | 310 args += [ "--apk-path=$_rebased_apk_path" ] |
| 311 args += [ "--incremental-install-script-path=$_rebased_incremental_insta
ll_script_path" ] | 311 args += [ "--incremental-install-script-path=$_rebased_incremental_insta
ll_script_path" ] |
| 312 | 312 |
| 313 assert(_rebased_incremental_apk_path != "") # Mark as used. | 313 assert(_rebased_incremental_apk_path != "") # Mark as used. |
| 314 if (_incremental_allowed) { | 314 if (_incremental_allowed) { |
| 315 args += [ "--incremental-apk-path=$_rebased_incremental_apk_path" ] | 315 args += [ "--incremental-apk-path=$_rebased_incremental_apk_path" ] |
| 316 } | 316 } |
| 317 } | 317 } |
| 318 } | 318 } |
| 319 | 319 if (defined(invoker.enable_relocation_packing)) { |
| 320 args += [ |
| 321 "--enable-relocation-packing", |
| 322 invoker.enable_relocation_packing, |
| 323 ] |
| 324 } |
| 320 if (defined(invoker.java_sources_file)) { | 325 if (defined(invoker.java_sources_file)) { |
| 321 args += [ | 326 args += [ |
| 322 "--java-sources-file", | 327 "--java-sources-file", |
| 323 rebase_path(invoker.java_sources_file, root_build_dir), | 328 rebase_path(invoker.java_sources_file, root_build_dir), |
| 324 ] | 329 ] |
| 325 } | 330 } |
| 326 if (defined(invoker.srcjar)) { | 331 if (defined(invoker.srcjar)) { |
| 327 args += [ | 332 args += [ |
| 328 "--srcjar", | 333 "--srcjar", |
| 329 rebase_path(invoker.srcjar, root_build_dir), | 334 rebase_path(invoker.srcjar, root_build_dir), |
| (...skipping 219 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 549 get_label_info(invoker.apk_under_test, "target_gen_dir") + "/" + | 554 get_label_info(invoker.apk_under_test, "target_gen_dir") + "/" + |
| 550 get_label_info(invoker.apk_under_test, "name") + ".build_config" | 555 get_label_info(invoker.apk_under_test, "name") + ".build_config" |
| 551 _rebased_apk_under_test_build_config = | 556 _rebased_apk_under_test_build_config = |
| 552 rebase_path(_apk_under_test_build_config, root_build_dir) | 557 rebase_path(_apk_under_test_build_config, root_build_dir) |
| 553 _apk_under_test = | 558 _apk_under_test = |
| 554 "@FileArg($_rebased_apk_under_test_build_config:deps_info:apk_path)" | 559 "@FileArg($_rebased_apk_under_test_build_config:deps_info:apk_path)" |
| 555 if (_incremental_install) { | 560 if (_incremental_install) { |
| 556 _apk_under_test = "@FileArg($_rebased_apk_under_test_build_config:deps
_info:incremental_apk_path)" | 561 _apk_under_test = "@FileArg($_rebased_apk_under_test_build_config:deps
_info:incremental_apk_path)" |
| 557 } | 562 } |
| 558 test_runner_args += [ "--apk-under-test=$_apk_under_test" ] | 563 test_runner_args += [ "--apk-under-test=$_apk_under_test" ] |
| 564 test_runner_args += [ |
| 565 "--enable-relocation-packing", |
| 566 "@FileArg($_rebased_apk_under_test_build_config:deps_info:enable_reloc
ation_packing)", |
| 567 ] |
| 559 } | 568 } |
| 560 if (emma_coverage) { | 569 if (emma_coverage) { |
| 561 # Set a default coverage output directory (can be overridden by user | 570 # Set a default coverage output directory (can be overridden by user |
| 562 # passing the same flag). | 571 # passing the same flag). |
| 563 test_runner_args += [ | 572 test_runner_args += [ |
| 564 "--coverage-dir", | 573 "--coverage-dir", |
| 565 rebase_path("$root_out_dir/coverage", root_build_dir), | 574 rebase_path("$root_out_dir/coverage", root_build_dir), |
| 566 ] | 575 ] |
| 567 } | 576 } |
| 568 } else if (_test_type == "junit") { | 577 } else if (_test_type == "junit") { |
| (...skipping 2366 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2935 rebase_path(root_build_dir, root_build_dir), | 2944 rebase_path(root_build_dir, root_build_dir), |
| 2936 "--packed-libraries-dir", | 2945 "--packed-libraries-dir", |
| 2937 rebase_path(_packed_libraries_dir, root_build_dir), | 2946 rebase_path(_packed_libraries_dir, root_build_dir), |
| 2938 "--libraries=${invoker.libraries_filearg}", | 2947 "--libraries=${invoker.libraries_filearg}", |
| 2939 "--filelistjson", | 2948 "--filelistjson", |
| 2940 rebase_path(invoker.file_list_json, root_build_dir), | 2949 rebase_path(invoker.file_list_json, root_build_dir), |
| 2941 ] | 2950 ] |
| 2942 } | 2951 } |
| 2943 } | 2952 } |
| 2944 } | 2953 } |
| OLD | NEW |