| Index: build/config/android/internal_rules.gni
|
| diff --git a/build/config/android/internal_rules.gni b/build/config/android/internal_rules.gni
|
| index 0c52d0624294c5a2d966f0f8375400bc667c11df..2dd8f76fea0fd96ffaca8f027439255978be4dae 100644
|
| --- a/build/config/android/internal_rules.gni
|
| +++ b/build/config/android/internal_rules.gni
|
| @@ -305,11 +305,17 @@ template("write_build_config") {
|
|
|
| if (defined(invoker.apk_path)) {
|
| _rebased_apk_path = rebase_path(invoker.apk_path, root_build_dir)
|
| + _rebased_apk_for_test_path = _rebased_apk_path
|
| + if (defined(invoker.apk_for_test_path)) {
|
| + _rebased_apk_for_test_path =
|
| + rebase_path(invoker.apk_for_test_path, root_build_dir)
|
| + }
|
| _rebased_incremental_apk_path =
|
| rebase_path(invoker.incremental_apk_path, root_build_dir)
|
| _rebased_incremental_install_script_path =
|
| rebase_path(invoker.incremental_install_script_path, root_build_dir)
|
| args += [ "--apk-path=$_rebased_apk_path" ]
|
| + args += [ "--apk-for-test-path=$_rebased_apk_for_test_path" ]
|
| args += [ "--incremental-apk-path=$_rebased_incremental_apk_path" ]
|
| args += [ "--incremental-install-script-path=$_rebased_incremental_install_script_path" ]
|
| }
|
| @@ -455,8 +461,7 @@ template("test_runner_script") {
|
| get_label_info(invoker.apk_under_test, "name") + ".build_config"
|
| _rebased_apk_under_test_build_config =
|
| rebase_path(_apk_under_test_build_config, root_build_dir)
|
| - _apk_under_test =
|
| - "@FileArg($_rebased_apk_under_test_build_config:deps_info:apk_path)"
|
| + _apk_under_test = "@FileArg($_rebased_apk_under_test_build_config:deps_info:apk_for_test_path)"
|
| if (_incremental_install) {
|
| _apk_under_test = "@FileArg($_rebased_apk_under_test_build_config:deps_info:incremental_apk_path)"
|
| }
|
|
|