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

Unified Diff: build/config/ios/rules.gni

Issue 1879003002: [iOS/GN] Convert //ios/third_party/earl_grey to build with GN. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@gn-ochamcrest
Patch Set: Remove proxy groups Created 4 years, 8 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.gn ('k') | build/config/mac/rules.gni » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/config/ios/rules.gni
diff --git a/build/config/ios/rules.gni b/build/config/ios/rules.gni
index 7ab676e7f8c5fd6ba99c6696c3aeb302e5141361..91f98bbcd3686246cd7e3c6a4bc3c6e20cbb4c9a 100644
--- a/build/config/ios/rules.gni
+++ b/build/config/ios/rules.gni
@@ -258,19 +258,18 @@ template("bundle_data_xib") {
# See "gn help shared_library" for more information on arguments supported
# by shared library target.
template("ios_framework_bundle") {
- if (defined(invoker.public_headers) && invoker.public_headers != []) {
- assert(defined(invoker.sources) && invoker.sources != [],
- "sources must be set for $target_name when public_headers is set")
-
- _target_name = target_name
- _output_name = target_name
- if (defined(invoker.output_name)) {
- _output_name = invoker.output_name
- }
+ _target_name = target_name
+ _output_name = target_name
+ if (defined(invoker.output_name)) {
+ _output_name = invoker.output_name
+ }
+ _framework_target = _target_name
+ if (defined(invoker.public_headers) && invoker.public_headers != []) {
_public_headers = invoker.public_headers
_framework_name = _output_name + ".framework"
_framework_root = "$root_out_dir/$_framework_name"
+ _framework_target = target_name + "_internal"
_header_map_filename = "$target_gen_dir/$_output_name.headers.hmap"
_framework_headers_target = _target_name + "_framework_headers"
@@ -332,6 +331,18 @@ template("ios_framework_bundle") {
include_dirs = [ _header_map_filename ]
}
+ _framework_public_config = _target_name + "_public_config"
+ config(_framework_public_config) {
+ # TODO(sdefresne): should we have a framework_dirs similar to lib_dirs
+ # and include_dirs to avoid duplicate values on the command-line.
+ common_flags = [ "-F" + rebase_path("$root_out_dir/.", root_out_dir) ]
+ cflags_objc = common_flags
+ cflags_objcc = common_flags
+ ldflags = common_flags
+ lib_dirs = [ root_out_dir ]
+ libs = [ _framework_name ]
+ }
+
group(_framework_headers_target) {
deps = [
":$_compile_headers_map_target",
@@ -341,15 +352,45 @@ template("ios_framework_bundle") {
}
}
- framework_bundle(target_name) {
- forward_variables_from(invoker, "*", [ "public_headers" ])
+ framework_bundle(_framework_target) {
+ forward_variables_from(invoker,
+ "*",
+ [
+ "output_name",
+ "public_headers",
+ "visibility",
+ ])
+ output_name = _output_name
if (defined(_public_headers)) {
+ visibility = [ ":$_target_name" ]
configs += [ ":$_headers_map_config" ]
+
if (!defined(deps)) {
deps = []
}
deps += [ ":$_framework_headers_target" ]
+ } else {
+ forward_variables_from(invoker, [ "visibility" ])
+ }
+ }
+
+ if (defined(_public_headers)) {
+ group(_target_name) {
+ forward_variables_from(invoker,
+ [
+ "testonly",
+ "visibility",
+ "public_configs",
+ ])
+
+ deps = [
+ ":$_framework_target",
+ ]
+ if (!defined(public_configs)) {
+ public_configs = []
+ }
+ public_configs += [ ":$_framework_public_config" ]
}
}
}
« no previous file with comments | « BUILD.gn ('k') | build/config/mac/rules.gni » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698