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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: build/config/BUILDCONFIG.gn

Issue 557463002: Make base_unittests_apk actually work (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@gn-group-datadeps
Patch Set: Created 6 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/android/pylib/gtest/setup.py ('k') | build/config/android/rules.gni » ('j') | testing/android/BUILD.gn » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/config/BUILDCONFIG.gn
diff --git a/build/config/BUILDCONFIG.gn b/build/config/BUILDCONFIG.gn
index c8e8d9ec7d514af8512d7e0e679b268e748cc0c7..5aa1159a144ba6b99485e37f7d018446b3059c72 100644
--- a/build/config/BUILDCONFIG.gn
+++ b/build/config/BUILDCONFIG.gn
@@ -497,6 +497,32 @@ if (is_component_build) {
}
template("component") {
+ # The sources assignment filter will have already been applied when the
cjhopman 2014/09/08 18:09:44 I would prefer that we didn't allow variables set
brettw 2014/09/08 20:04:22 I'd rather keep this the old way, maybe we can res
cjhopman 2014/09/09 16:55:32 Done.
+ # code was originally executed. We don't want to apply it again, since
+ # the original target may have override it for some assignments.
+ set_sources_assignment_filter([])
+
+ if (defined(invoker.all_dependent_configs)) { all_dependent_configs = invoker.all_dependent_configs }
+ if (defined(invoker.cflags)) { cflags = invoker.cflags }
+ if (defined(invoker.cflags_c)) { cflags_c = invoker.cflags_c }
+ if (defined(invoker.cflags_cc)) { cflags_cc = invoker.cflags_cc }
+ if (defined(invoker.cflags_objc)) { cflags_objc = invoker.cflags_objc }
+ if (defined(invoker.cflags_objcc)) { cflags_objcc = invoker.cflags_objcc }
+ if (defined(invoker.data)) { data = invoker.data }
+ if (defined(invoker.datadeps)) { datadeps = invoker.datadeps }
+ if (defined(invoker.defines)) { defines = invoker.defines }
+ if (defined(invoker.deps)) { deps = invoker.deps }
+ if (defined(invoker.direct_dependent_configs)) { direct_dependent_configs = invoker.direct_dependent_configs }
+ if (defined(invoker.forward_dependent_configs_from)) { forward_dependent_configs_from = invoker.forward_dependent_configs_from }
+ if (defined(invoker.include_dirs)) { include_dirs = invoker.include_dirs }
+ if (defined(invoker.ldflags)) { ldflags = invoker.ldflags }
+ if (defined(invoker.lib_dirs)) { lib_dirs = invoker.lib_dirs }
+ if (defined(invoker.libs)) { libs = invoker.libs }
+ if (defined(invoker.output_extension)) { output_extension = invoker.output_extension }
+ if (defined(invoker.output_name)) { output_name = invoker.output_name }
+ if (defined(invoker.public)) { public = invoker.public }
+ if (defined(invoker.sources)) { sources = invoker.sources }
+ if (defined(invoker.visibility)) { visibility = invoker.visibility }
if (is_component_build) {
shared_library(target_name) {
# Configs will always be defined since we set_defaults for a component
@@ -504,64 +530,12 @@ template("component") {
# shared/static library inside the component.
configs = [] # Prevent list overwriting warning.
configs = invoker.configs
-
- # The sources assignment filter will have already been applied when the
- # code was originally executed. We don't want to apply it again, since
- # the original target may have override it for some assignments.
- set_sources_assignment_filter([])
-
- if (defined(invoker.all_dependent_configs)) { all_dependent_configs = invoker.all_dependent_configs }
- if (defined(invoker.cflags)) { cflags = invoker.cflags }
- if (defined(invoker.cflags_c)) { cflags_c = invoker.cflags_c }
- if (defined(invoker.cflags_cc)) { cflags_cc = invoker.cflags_cc }
- if (defined(invoker.cflags_objc)) { cflags_objc = invoker.cflags_objc }
- if (defined(invoker.cflags_objcc)) { cflags_objcc = invoker.cflags_objcc }
- if (defined(invoker.data)) { data = invoker.data }
- if (defined(invoker.datadeps)) { datadeps = invoker.datadeps }
- if (defined(invoker.defines)) { defines = invoker.defines }
- if (defined(invoker.deps)) { deps = invoker.deps }
- if (defined(invoker.direct_dependent_configs)) { direct_dependent_configs = invoker.direct_dependent_configs }
- if (defined(invoker.forward_dependent_configs_from)) { forward_dependent_configs_from = invoker.forward_dependent_configs_from }
- if (defined(invoker.include_dirs)) { include_dirs = invoker.include_dirs }
- if (defined(invoker.ldflags)) { ldflags = invoker.ldflags }
- if (defined(invoker.lib_dirs)) { lib_dirs = invoker.lib_dirs }
- if (defined(invoker.libs)) { libs = invoker.libs }
- if (defined(invoker.output_extension)) { output_extension = invoker.output_extension }
- if (defined(invoker.output_name)) { output_name = invoker.output_name }
- if (defined(invoker.public)) { public = invoker.public }
- if (defined(invoker.sources)) { sources = invoker.sources }
- if (defined(invoker.visibility)) { visibility = invoker.visibility }
}
} else {
source_set(target_name) {
# See above.
configs = [] # Prevent list overwriting warning.
configs = invoker.configs
-
- # See above call.
- set_sources_assignment_filter([])
-
- if (defined(invoker.all_dependent_configs)) { all_dependent_configs = invoker.all_dependent_configs }
- if (defined(invoker.cflags)) { cflags = invoker.cflags }
- if (defined(invoker.cflags_c)) { cflags_c = invoker.cflags_c }
- if (defined(invoker.cflags_cc)) { cflags_cc = invoker.cflags_cc }
- if (defined(invoker.cflags_objc)) { cflags_objc = invoker.cflags_objc }
- if (defined(invoker.cflags_objcc)) { cflags_objcc = invoker.cflags_objcc }
- if (defined(invoker.data)) { data = invoker.data }
- if (defined(invoker.datadeps)) { datadeps = invoker.datadeps }
- if (defined(invoker.defines)) { defines = invoker.defines }
- if (defined(invoker.deps)) { deps = invoker.deps }
- if (defined(invoker.direct_dependent_configs)) { direct_dependent_configs = invoker.direct_dependent_configs }
- if (defined(invoker.forward_dependent_configs_from)) { forward_dependent_configs_from = invoker.forward_dependent_configs_from }
- if (defined(invoker.include_dirs)) { include_dirs = invoker.include_dirs }
- if (defined(invoker.ldflags)) { ldflags = invoker.ldflags }
- if (defined(invoker.lib_dirs)) { lib_dirs = invoker.lib_dirs }
- if (defined(invoker.libs)) { libs = invoker.libs }
- if (defined(invoker.output_extension)) { output_extension = invoker.output_extension }
- if (defined(invoker.output_name)) { output_name = invoker.output_name }
- if (defined(invoker.public)) { public = invoker.public }
- if (defined(invoker.sources)) { sources = invoker.sources }
- if (defined(invoker.visibility)) { visibility = invoker.visibility }
}
}
}
@@ -573,38 +547,48 @@ template("component") {
# Define a test as an executable with the "testonly" flag set. In the future,
# this will need to be enhanced for Android.
template("test") {
- executable(target_name) {
- # Configs will always be defined since we set_defaults for a component
- # above. We want to use those rather than whatever came with the nested
- # shared/static library inside the component.
- configs = [] # Prevent list overwriting warning.
- configs = invoker.configs
-
- testonly = true
-
- # See above call.
- set_sources_assignment_filter([])
-
- if (defined(invoker.all_dependent_configs)) { all_dependent_configs = invoker.all_dependent_configs }
- if (defined(invoker.cflags)) { cflags = invoker.cflags }
- if (defined(invoker.cflags_c)) { cflags_c = invoker.cflags_c }
- if (defined(invoker.cflags_cc)) { cflags_cc = invoker.cflags_cc }
- if (defined(invoker.cflags_objc)) { cflags_objc = invoker.cflags_objc }
- if (defined(invoker.cflags_objcc)) { cflags_objcc = invoker.cflags_objcc }
- if (defined(invoker.data)) { data = invoker.data }
- if (defined(invoker.datadeps)) { datadeps = invoker.datadeps }
- if (defined(invoker.defines)) { defines = invoker.defines }
- if (defined(invoker.deps)) { deps = invoker.deps }
- if (defined(invoker.direct_dependent_configs)) { direct_dependent_configs = invoker.direct_dependent_configs }
- if (defined(invoker.forward_dependent_configs_from)) { forward_dependent_configs_from = invoker.forward_dependent_configs_from }
- if (defined(invoker.include_dirs)) { include_dirs = invoker.include_dirs }
- if (defined(invoker.ldflags)) { ldflags = invoker.ldflags }
- if (defined(invoker.lib_dirs)) { lib_dirs = invoker.lib_dirs }
- if (defined(invoker.libs)) { libs = invoker.libs }
- if (defined(invoker.output_extension)) { output_extension = invoker.output_extension }
- if (defined(invoker.output_name)) { output_name = invoker.output_name }
- if (defined(invoker.public)) { public = invoker.public }
- if (defined(invoker.sources)) { sources = invoker.sources }
- if (defined(invoker.visibility)) { visibility = invoker.visibility }
+ # See above call.
+ set_sources_assignment_filter([])
+
+ if (defined(invoker.all_dependent_configs)) { all_dependent_configs = invoker.all_dependent_configs }
+ if (defined(invoker.cflags)) { cflags = invoker.cflags }
+ if (defined(invoker.cflags_c)) { cflags_c = invoker.cflags_c }
+ if (defined(invoker.cflags_cc)) { cflags_cc = invoker.cflags_cc }
+ if (defined(invoker.cflags_objc)) { cflags_objc = invoker.cflags_objc }
+ if (defined(invoker.cflags_objcc)) { cflags_objcc = invoker.cflags_objcc }
+ if (defined(invoker.data)) { data = invoker.data }
+ if (defined(invoker.datadeps)) { datadeps = invoker.datadeps }
+ if (defined(invoker.defines)) { defines = invoker.defines }
+ if (defined(invoker.deps)) { deps = invoker.deps }
+ if (defined(invoker.direct_dependent_configs)) { direct_dependent_configs = invoker.direct_dependent_configs }
+ if (defined(invoker.forward_dependent_configs_from)) { forward_dependent_configs_from = invoker.forward_dependent_configs_from }
+ if (defined(invoker.include_dirs)) { include_dirs = invoker.include_dirs }
+ if (defined(invoker.ldflags)) { ldflags = invoker.ldflags }
+ if (defined(invoker.lib_dirs)) { lib_dirs = invoker.lib_dirs }
+ if (defined(invoker.libs)) { libs = invoker.libs }
+ if (defined(invoker.output_extension)) { output_extension = invoker.output_extension }
+ if (defined(invoker.output_name)) { output_name = invoker.output_name }
+ if (defined(invoker.public)) { public = invoker.public }
+ if (defined(invoker.sources)) { sources = invoker.sources }
+ if (defined(invoker.visibility)) { visibility = invoker.visibility }
+
+ testonly = true
+
+ if (is_android) {
+ shared_library(target_name) {
+ # Configs will always be defined since we set_defaults for a component
+ # above. We want to use those rather than whatever came with the nested
+ # shared/static library inside the component.
+ configs = [] # Prevent list overwriting warning.
+ configs = invoker.configs
+ }
+ } else {
+ executable(target_name) {
+ # Configs will always be defined since we set_defaults for a component
+ # above. We want to use those rather than whatever came with the nested
+ # shared/static library inside the component.
+ configs = [] # Prevent list overwriting warning.
+ configs = invoker.configs
+ }
}
}
« no previous file with comments | « build/android/pylib/gtest/setup.py ('k') | build/config/android/rules.gni » ('j') | testing/android/BUILD.gn » ('J')

Powered by Google App Engine
This is Rietveld 408576698