| Index: testing/test.gni
|
| diff --git a/testing/test.gni b/testing/test.gni
|
| index 6739bfebb21ce85f18903e934fe9822658d2f109..3ba52cf7d007a92ef2c950d723da69b7ffe1b53a 100644
|
| --- a/testing/test.gni
|
| +++ b/testing/test.gni
|
| @@ -123,53 +123,14 @@ template("test") {
|
| ]
|
| }
|
| } else if (is_ios) {
|
| - if (is_ios) {
|
| - import("//build/config/ios/rules.gni")
|
| - }
|
| -
|
| - ios_app(target_name) {
|
| - # TODO(GYP): Make this configurable and only provide a default
|
| - # that can be overridden.
|
| - info_plist = "//testing/gtest_ios/unittest-Info.plist"
|
| - app_name = target_name
|
| - entitlements_path = "//testing/gtest_ios"
|
| - code_signing_identity = ""
|
| - testonly = true
|
| -
|
| - # See above call.
|
| - set_sources_assignment_filter([])
|
| -
|
| - forward_variables_from(invoker,
|
| - [
|
| - "all_dependent_configs",
|
| - "allow_circular_includes_from",
|
| - "cflags",
|
| - "cflags_c",
|
| - "cflags_cc",
|
| - "cflags_objc",
|
| - "cflags_objcc",
|
| - "check_includes",
|
| - "configs",
|
| - "data",
|
| - "data_deps",
|
| - "defines",
|
| - "include_dirs",
|
| - "ldflags",
|
| - "libs",
|
| - "output_extension",
|
| - "output_name",
|
| - "public",
|
| - "public_configs",
|
| - "public_deps",
|
| - "sources",
|
| - "visibility",
|
| - ])
|
| + import("//build/config/ios/rules.gni")
|
| + ios_test_app(target_name) {
|
| + forward_variables_from(invoker, "*")
|
|
|
| - if (defined(invoker.deps)) {
|
| - deps = invoker.deps
|
| - } else {
|
| + if (!defined(invoker.deps)) {
|
| deps = []
|
| }
|
| +
|
| deps += [
|
| # All shared libraries must have the sanitizer deps to properly link in
|
| # asan mode (this target will be empty in other cases).
|
|
|