Commit d5dccb2b authored by John Budorick's avatar John Budorick Committed by Commit Bot

android: fix executable test data_deps propagation.

gn treats executables as build-time dependencies by default; run-time
dependencies of executables are not propagated unless the executable
target is explicitly included in data_deps. This was causing issues for
android's native executable tests that had data_deps of their own, as
those data_deps weren't being propagated from the internal executable
target up to the top-level wrapper target. This CL fixes that.

Bug: 1041670
Change-Id: I1e8340c473ff1d655364336e705955c376886896
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2033984
Commit-Queue: John Budorick <jbudorick@chromium.org>
Commit-Queue: Andrew Grieve <agrieve@chromium.org>
Auto-Submit: John Budorick <jbudorick@chromium.org>
Reviewed-by: default avatarAndrew Grieve <agrieve@chromium.org>
Cr-Commit-Position: refs/heads/master@{#737557}
parent 16353527
...@@ -160,6 +160,7 @@ template("test") { ...@@ -160,6 +160,7 @@ template("test") {
if (_use_raw_android_executable) { if (_use_raw_android_executable) {
executable_dist_dir = "$root_out_dir/$_dist_target" executable_dist_dir = "$root_out_dir/$_dist_target"
data_deps = [ ":$_exec_target" ]
} else { } else {
apk_target = ":$_apk_target" apk_target = ":$_apk_target"
incremental_apk = incremental_install incremental_apk = incremental_install
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment