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

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

Issue 1874393002: 🏆 Allow Android test wrapper scripts to specify their timeouts in GN/GYP (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 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
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/sanitizers/sanitizers.gni") 6 import("//build/config/sanitizers/sanitizers.gni")
7 import("//build/config/zip.gni") 7 import("//build/config/zip.gni")
8 import("//third_party/ijar/ijar.gni") 8 import("//third_party/ijar/ijar.gni")
9 9
10 assert(is_android) 10 assert(is_android)
(...skipping 2140 matching lines...) Expand 10 before | Expand all | Expand 10 after
2151 "@FileArg($_rebased_build_config:deps_info:apk_path)", 2151 "@FileArg($_rebased_build_config:deps_info:apk_path)",
2152 ] 2152 ]
2153 } 2153 }
2154 } 2154 }
2155 if (defined(invoker.isolate_file)) { 2155 if (defined(invoker.isolate_file)) {
2156 test_runner_args += [ 2156 test_runner_args += [
2157 "--isolate-file-path", 2157 "--isolate-file-path",
2158 rebase_path(invoker.isolate_file, root_build_dir), 2158 rebase_path(invoker.isolate_file, root_build_dir),
2159 ] 2159 ]
2160 } 2160 }
2161 if (defined(invoker.shard_timeout)) {
2162 test_runner_args += [ "--shard-timeout=${invoker.shard_timeout}" ]
2163 }
2161 if (_incremental_install) { 2164 if (_incremental_install) {
2162 test_runner_args += [ 2165 test_runner_args += [
2163 "--test-apk-incremental-install-script", 2166 "--test-apk-incremental-install-script",
2164 "@FileArg($_rebased_apk_build_config:deps_info:incremental_install_scrip t_path)", 2167 "@FileArg($_rebased_apk_build_config:deps_info:incremental_install_scrip t_path)",
2165 ] 2168 ]
2166 if (defined(invoker.apk_under_test)) { 2169 if (defined(invoker.apk_under_test)) {
2167 test_runner_args += [ 2170 test_runner_args += [
2168 "--apk-under-test-incremental-install-script", 2171 "--apk-under-test-incremental-install-script",
2169 "@FileArg($_rebased_apk_under_test_build_config:deps_info:incremental_ install_script_path)", 2172 "@FileArg($_rebased_apk_under_test_build_config:deps_info:incremental_ install_script_path)",
2170 ] 2173 ]
(...skipping 15 matching lines...) Expand all
2186 2189
2187 args = [ 2190 args = [
2188 "--depfile", 2191 "--depfile",
2189 rebase_path(depfile, root_build_dir), 2192 rebase_path(depfile, root_build_dir),
2190 "--script-output-path", 2193 "--script-output-path",
2191 rebase_path(generated_script, root_build_dir), 2194 rebase_path(generated_script, root_build_dir),
2192 ] 2195 ]
2193 args += test_runner_args 2196 args += test_runner_args
2194 } 2197 }
2195 } 2198 }
OLDNEW
« no previous file with comments | « build/android/test_runner.gypi ('k') | components/cronet.gypi » ('j') | net/net.gyp » ('J')

Powered by Google App Engine
This is Rietveld 408576698