Android: Make "incremental install" enabled by GN arg
Before:
* ninja chrome_public_apk_incremental
After:
* gn gen --args='incremental_install=true ...' .
* ninja chrome_public_apk
Why make this change?
* Simpler mental model (e.g. most other build things use GN args)
* Reduces the load on bots that build all targets
* "gn gen" on my machine goes from 7200ms -> 6500ms
Bug: 1013688
Change-Id: I62c7c1cea2002a6932867ebf91b31ffbaa8d6a30
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1856438
Commit-Queue: Andrew Grieve <[email protected]>
Reviewed-by: Eric Stevenson <[email protected]>
Reviewed-by: Dirk Pranke <[email protected]>
Cr-Commit-Position: refs/heads/master@{#708209}
diff --git a/testing/test.gni b/testing/test.gni
index 654cea2..9fdf9c71 100644
--- a/testing/test.gni
+++ b/testing/test.gni
@@ -48,9 +48,6 @@
assert(_use_raw_android_executable || enable_java_templates)
- _incremental_apk_only =
- incremental_apk_by_default && !_use_raw_android_executable
-
if (_use_raw_android_executable) {
_exec_target = "${target_name}__exec"
_dist_target = "${target_name}__dist"
@@ -161,61 +158,26 @@
deps += [ ":${_unwind_table_asset_name}" ]
}
}
+ }
- _test_runner_target = "${_output_name}__test_runner_script"
- _incremental_test_name = "${_output_name}_incremental"
- _incremental_test_runner_target =
- "${_output_name}_incremental__test_runner_script"
- if (_incremental_apk_only) {
- _incremental_test_name = _output_name
- _incremental_test_runner_target = _test_runner_target
- }
+ test_runner_script(_test_runner_target) {
+ forward_variables_from(invoker, _wrapper_script_vars)
- # Incremental test targets work only for .apks.
- test_runner_script(_incremental_test_runner_target) {
- forward_variables_from(invoker, _wrapper_script_vars)
+ if (_use_raw_android_executable) {
+ executable_dist_dir = "$root_out_dir/$_dist_target"
+ } else {
+ apk_target = ":$_apk_target"
+ incremental_apk = incremental_install
# Dep needed for the test runner .runtime_deps file to pick up data
# deps from the forward_variables_from(invoker, "*") on the library.
data_deps = [
":$_library_target",
]
- apk_target = ":$_apk_target"
- test_name = _incremental_test_name
- test_type = "gtest"
- test_suite = _output_name
- incremental_install = true
}
- group("${target_name}_incremental") {
- testonly = true
- data_deps = [
- ":$_incremental_test_runner_target",
- ]
- deps = [
- ":${_apk_target}_incremental",
- ]
- }
- }
-
- if (!_incremental_apk_only) {
- test_runner_script(_test_runner_target) {
- forward_variables_from(invoker, _wrapper_script_vars)
-
- if (_use_raw_android_executable) {
- executable_dist_dir = "$root_out_dir/$_dist_target"
- } else {
- apk_target = ":$_apk_target"
-
- # Dep needed for the test runner .runtime_deps file to pick up data
- # deps from the forward_variables_from(invoker, "*") on the library.
- data_deps = [
- ":$_library_target",
- ]
- }
- test_name = _output_name
- test_type = "gtest"
- test_suite = _output_name
- }
+ test_name = _output_name
+ test_suite = _output_name
+ test_type = "gtest"
}
# Create a wrapper script rather than using a group() in order to ensure
