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

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

Issue 1854233002: Reland 2 of GN: Make breakpad_unittests & sandbox_linux_unittests use test() (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@test-minor-renames
Patch Set: Fix PIE errors, fix component mode. 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
« 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 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 2052 matching lines...) Expand 10 before | Expand all | Expand 10 after
2063 2063
2064 action(target_name) { 2064 action(target_name) {
2065 script = "//build/android/gyp/create_test_runner_script.py" 2065 script = "//build/android/gyp/create_test_runner_script.py"
2066 depfile = "$target_gen_dir/$target_name.d" 2066 depfile = "$target_gen_dir/$target_name.d"
2067 deps = [] 2067 deps = []
2068 2068
2069 datadeps = [ 2069 datadeps = [
2070 "//build/android:test_runner_py", 2070 "//build/android:test_runner_py",
2071 ] 2071 ]
2072 2072
2073 test_runner_args = [
2074 _test_type,
2075 "--output-directory",
2076 rebase_path(root_build_dir, root_build_dir),
2077 ]
2078
2073 # apk_target is not used for native executable tests 2079 # apk_target is not used for native executable tests
2074 # (e.g. breakpad_unittests). 2080 # (e.g. breakpad_unittests).
2075 if (defined(invoker.apk_target)) { 2081 if (defined(invoker.apk_target)) {
2082 assert(!defined(invoker.executable_dist_dir))
2076 deps += [ "${invoker.apk_target}__build_config" ] 2083 deps += [ "${invoker.apk_target}__build_config" ]
2077 _apk_build_config = 2084 _apk_build_config =
2078 get_label_info(invoker.apk_target, "target_gen_dir") + "/" + 2085 get_label_info(invoker.apk_target, "target_gen_dir") + "/" +
2079 get_label_info(invoker.apk_target, "name") + ".build_config" 2086 get_label_info(invoker.apk_target, "name") + ".build_config"
2080 _rebased_apk_build_config = rebase_path(_apk_build_config, root_build_dir) 2087 _rebased_apk_build_config = rebase_path(_apk_build_config, root_build_dir)
2081 assert(_rebased_apk_build_config != "") # Mark as used. 2088 assert(_rebased_apk_build_config != "") # Mark as used.
2089 } else if (_test_type == "gtest") {
2090 assert(
2091 defined(invoker.executable_dist_dir),
2092 "Must define either apk_target or executable_dist_dir for test_runner_ script()")
2093 test_runner_args += [
2094 "--executable-dist-dir",
2095 rebase_path(invoker.executable_dist_dir, root_build_dir),
2096 ]
2082 } 2097 }
2083 2098
2084 test_runner_args = [
2085 _test_type,
2086 "--output-directory",
2087 rebase_path(root_build_dir, root_build_dir),
2088 ]
2089 if (_test_type == "gtest") { 2099 if (_test_type == "gtest") {
2090 assert(defined(invoker.test_suite)) 2100 assert(defined(invoker.test_suite))
2091 test_runner_args += [ 2101 test_runner_args += [
2092 "--suite", 2102 "--suite",
2093 invoker.test_suite, 2103 invoker.test_suite,
2094 ] 2104 ]
2095 } else if (_test_type == "instrumentation") { 2105 } else if (_test_type == "instrumentation") {
2096 _test_apk = "@FileArg($_rebased_apk_build_config:deps_info:apk_path)" 2106 _test_apk = "@FileArg($_rebased_apk_build_config:deps_info:apk_path)"
2097 if (_incremental_install) { 2107 if (_incremental_install) {
2098 _test_apk = "@FileArg($_rebased_apk_build_config:deps_info:incremental_a pk_path)" 2108 _test_apk = "@FileArg($_rebased_apk_build_config:deps_info:incremental_a pk_path)"
(...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after
2172 ] 2182 ]
2173 args = [ 2183 args = [
2174 "--depfile", 2184 "--depfile",
2175 rebase_path(depfile, root_build_dir), 2185 rebase_path(depfile, root_build_dir),
2176 "--script-output-path", 2186 "--script-output-path",
2177 rebase_path(generated_script, root_build_dir), 2187 rebase_path(generated_script, root_build_dir),
2178 ] 2188 ]
2179 args += test_runner_args 2189 args += test_runner_args
2180 } 2190 }
2181 } 2191 }
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