Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(382)

Unified Diff: testing/test.gni

Issue 1314413006: make sure cflags is forwarded in the ios_app executable template (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: remove __sources target from test() template, forward more vars Created 5 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « build/config/ios/rules.gni ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: testing/test.gni
diff --git a/testing/test.gni b/testing/test.gni
index 3780ebd5f757548f65409816abc8e94c5c1ab8bb..6ddb338acae4cf88472ddc200371979b7fe1a5df 100644
--- a/testing/test.gni
+++ b/testing/test.gni
@@ -110,33 +110,6 @@ template("test") {
import("//build/config/ios/rules.gni")
}
- target__sources_name = "${target_name}__sources"
- if (defined(invoker.sources)) {
- source_set(target__sources_name) {
- sources = invoker.sources
- testonly = true
-
- configs = [] # Prevent list overwriting warning.
- configs += invoker.configs
-
- forward_variables_from(invoker,
- [
- "cflags",
- "cflags_c",
- "cflags_cc",
- "cflags_objc",
- "cflags_objcc",
- "data",
- "data_deps",
- "datadeps",
- "defines",
- "deps",
- "include_dirs",
- "includes",
- ])
- }
- }
-
ios_app(target_name) {
# TODO(GYP): Make this configurable and only provide a default
# that can be overridden.
@@ -159,7 +132,12 @@ template("test") {
"cflags_objc",
"cflags_objcc",
"check_includes",
+ "configs",
+ "data",
+ "data_deps",
+ "defines",
"forward_dependent_configs_from",
+ "include_dirs",
"ldflags",
"libs",
"output_extension",
@@ -167,6 +145,7 @@ template("test") {
"public",
"public_configs",
"public_deps",
+ "sources",
"visibility",
])
@@ -180,10 +159,6 @@ template("test") {
# asan mode (this target will be empty in other cases).
"//build/config/sanitizers:deps",
]
-
- if (defined(invoker.sources)) {
- deps += [ ":${target__sources_name}" ]
- }
}
} else {
executable(target_name) {
« no previous file with comments | « build/config/ios/rules.gni ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698