Chromium Code Reviews| 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 573 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 584 generated_script, | 584 generated_script, |
| 585 ] | 585 ] |
| 586 data += [ generated_script ] | 586 data += [ generated_script ] |
| 587 | 587 |
| 588 args = [ | 588 args = [ |
| 589 "--depfile", | 589 "--depfile", |
| 590 rebase_path(depfile, root_build_dir), | 590 rebase_path(depfile, root_build_dir), |
| 591 "--script-output-path", | 591 "--script-output-path", |
| 592 rebase_path(generated_script, root_build_dir), | 592 rebase_path(generated_script, root_build_dir), |
| 593 ] | 593 ] |
| 594 if (defined(test_runner_script)) { | |
|
jbudorick
2016/11/23 17:09:31
I think this would have to be invoker.test_runner_
ehmaldonado_chromium
2016/11/23 17:19:32
I was planning to have this be a variable in //bui
kjellander_chromium
2016/11/23 20:05:40
If we can avoid forcing downstream projects like V
| |
| 595 args += [ | |
| 596 "--test-runner-path", | |
| 597 test_runner_script, | |
| 598 ] | |
| 599 } | |
| 600 | |
| 594 args += test_runner_args | 601 args += test_runner_args |
| 595 } | 602 } |
| 596 } | 603 } |
| 597 | 604 |
| 598 if (enable_java_templates) { | 605 if (enable_java_templates) { |
| 599 import("//build/config/zip.gni") | 606 import("//build/config/zip.gni") |
| 600 import("//third_party/ijar/ijar.gni") | 607 import("//third_party/ijar/ijar.gni") |
| 601 import("//third_party/android_platform/config.gni") | 608 import("//third_party/android_platform/config.gni") |
| 602 | 609 |
| 603 rebased_android_sdk = rebase_path(android_sdk, root_build_dir) | 610 rebased_android_sdk = rebase_path(android_sdk, root_build_dir) |
| (...skipping 2119 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 2723 rebase_path(root_build_dir, root_build_dir), | 2730 rebase_path(root_build_dir, root_build_dir), |
| 2724 "--packed-libraries-dir", | 2731 "--packed-libraries-dir", |
| 2725 rebase_path(_packed_libraries_dir, root_build_dir), | 2732 rebase_path(_packed_libraries_dir, root_build_dir), |
| 2726 "--libraries=${invoker.libraries_filearg}", | 2733 "--libraries=${invoker.libraries_filearg}", |
| 2727 "--filelistjson", | 2734 "--filelistjson", |
| 2728 rebase_path(invoker.file_list_json, root_build_dir), | 2735 rebase_path(invoker.file_list_json, root_build_dir), |
| 2729 ] | 2736 ] |
| 2730 } | 2737 } |
| 2731 } | 2738 } |
| 2732 } | 2739 } |
| OLD | NEW |