Chromium Code Reviews| Index: components/cronet/ios/BUILD.gn |
| diff --git a/components/cronet/ios/BUILD.gn b/components/cronet/ios/BUILD.gn |
| index 19ff7514cf2e3ed18404b4541d512bd9370e9519..7581b2c3a0f4d2090ad7aeeda87f3c4d7ef334e8 100644 |
| --- a/components/cronet/ios/BUILD.gn |
| +++ b/components/cronet/ios/BUILD.gn |
| @@ -4,6 +4,8 @@ |
| import("//build/buildflag_header.gni") |
| import("//build/config/ios/rules.gni") |
| +import("//build/config/mac/symbols.gni") |
| +import("//build/mac/tweak_info_plist.gni") |
| import("//build/util/version.gni") |
| import("//chrome/version.gni") |
| import("//testing/test.gni") |
| @@ -53,17 +55,44 @@ source_set("cronet_sources") { |
| } |
| } |
| +# Tweak |info_plist| with current version and revision. |
| +tweak_info_plist("tweak_cronet_plist") { |
| + info_plist = "Info.plist" |
| + args = [] |
| +} |
| + |
| +# Compile plist into |output_name|. |
| +ios_info_plist("compile_cronet_plist") { |
| + executable_name = "Cronet" |
| + output_name = "$target_gen_dir/Info.plist" |
| + info_plist_target = ":tweak_cronet_plist" |
| +} |
| + |
| +# Bundle plist into Cronet.Framework. |
| +bundle_data("cronet_info_plist") { |
| + deps = [ |
| + ":compile_cronet_plist", |
| + ] |
| + |
| + sources = [ |
| + "$target_gen_dir/Info.plist", |
| + ] |
| + outputs = [ |
| + "{{bundle_root_dir}}/Info.plist", |
| + ] |
| +} |
| + |
| ios_framework_bundle("cronet_framework") { |
| output_name = "Cronet" |
| deps = [ |
| + ":compile_cronet_plist", |
| + ":cronet_info_plist", |
| ":cronet_sources", |
| "//base", |
| "//net:net", |
| ] |
| - info_plist = "Info.plist" |
| - |
| libs = [ "UIKit.Framework" ] |
| public_headers = [ |
| @@ -75,6 +104,10 @@ ios_framework_bundle("cronet_framework") { |
| "Cronet.h", |
| "Cronet.mm", |
| ] |
| + |
| + configs -= [ "//build/config/compiler:default_symbols" ] |
| + configs += [ "//build/config/compiler:symbols" ] |
| + configs += [ "//build/config/mac:strip_all" ] |
|
kapishnikov
2016/07/14 21:37:37
We should remove this line since we should not str
Robert Sesek
2016/07/14 21:40:12
The symbols are stripped after dsymutil is run. Th
kapishnikov
2016/07/14 21:45:50
Does the target generate the dsym bundle? If yes,
Robert Sesek
2016/07/14 21:49:34
If the gn arg |enable_dsyms=true|, then all linked
mef
2016/07/15 13:50:28
This works with gn arg enable_dsyms=true and enabl
|
| } |
| bundle_data("cronet_test_bundle_data") { |
| @@ -150,8 +183,6 @@ copy("cronet_package_copy") { |
| "$root_out_dir/Cronet.framework", |
| "//AUTHORS", |
| "//chrome/VERSION", |
| - "//components/cronet/ios/Cronet.h", |
| - "//components/cronet/ios/cronet_c_for_grpc.h", |
| ] |
| outputs = [ |
| "$_package_dir/{{source_file_part}}", |