[iOS] Fix testing/test.gni on iOS as follow-up to gn tool refactoring.
With https://codereview.chromium.org/1804263003, data_deps are no
longer recursed when looking for bundle_data (as the data is needed
at compilation time) so change testing/test.gni to use deps instead
of data_deps.
BUG=297668
Review URL: https://codereview.chromium.org/1813763004
Cr-Commit-Position: refs/heads/master@{#381939}
diff --git a/testing/test.gni b/testing/test.gni
index aaa8501..8b63ba3 100644
--- a/testing/test.gni
+++ b/testing/test.gni
@@ -140,7 +140,10 @@
_resources_bundle_data = target_name + "_resources_bundle_data"
bundle_data(_resources_bundle_data) {
- visibility = [ ":$_test_target" ]
+ visibility = [
+ ":${_test_target}",
+ ":${_test_target}_generate_executable",
+ ]
sources = [
"//testing/gtest_ios/Default.png",
]
@@ -168,14 +171,12 @@
deps = []
}
deps += [
+ ":$_resources_bundle_data",
+
# All shared libraries must have the sanitizer deps to properly link in
# asan mode (this target will be empty in other cases).
"//build/config/sanitizers:deps",
]
- if (!defined(data_deps)) {
- data_deps = []
- }
- data_deps += [ ":$_resources_bundle_data" ]
}
} else {
main_target_name = target_name
