admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix paths for macOS framework’s copy actions.

Browse Source 
Using the mac framework bundle's path should be more correct than the
hardcoded version used previously.

Bug: webrtc:9627
Change-Id: I706c7961f21ba921503ed68b6e79ea0838e664d5
Reviewed-on: https://webrtc-review.googlesource.com/98620
Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org>
Commit-Queue: Anders Carlsson <andersc@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#24606}
This commit is contained in:
Anders Carlsson 2018-09-06 15:48:17 +02:00 committed by Commit Bot
parent 366a50c4ef
commit 95c56eebe0
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
webrtc.gni
View File

@ -698,8 +698,8 @@ if (is_ios) {
if (is_mac) {
template("mac_framework_bundle_with_umbrella_header") {
forward_variables_from(invoker, [ "output_name" ])
umbrella_header_path =
"$target_gen_dir/$output_name.framework/Headers/$output_name.h"
this_target_name = target_name
umbrella_header_path = "$target_gen_dir/umbrella_header/$output_name.h"
mac_framework_bundle(target_name) {
forward_variables_from(invoker, "*", [])
@ -714,20 +714,21 @@ if (is_mac) {
]
deps += [
":copy_framework_headers_$target_name",
":copy_umbrella_header_$target_name",
":copy_framework_headers_$this_target_name",
":copy_umbrella_header_$this_target_name",
":umbrella_header_$this_target_name",
]
}
copy("copy_framework_headers_$target_name") {
bundle_data("copy_framework_headers_$this_target_name") {
forward_variables_from(invoker, [ "sources" ])
outputs = [
"$root_out_dir/$output_name.framework/Headers/{{source_file_part}}",
"{{bundle_contents_dir}}/Headers/{{source_file_part}}",
]
}
action("umbrella_header_$target_name") {
action("umbrella_header_$this_target_name") {
forward_variables_from(invoker, [ "sources" ])
script = "//tools_webrtc/ios/generate_umbrella_header.py"
@ -742,16 +743,16 @@ if (is_mac) {
] + sources
}
copy("copy_umbrella_header_$target_name") {
bundle_data("copy_umbrella_header_$this_target_name") {
sources = [
umbrella_header_path,
]
outputs = [
"$root_out_dir/$output_name.framework/Headers/$output_name.h",
"{{bundle_contents_dir}}/Headers/$output_name.h",
]
deps = [
":umbrella_header_$target_name",
":umbrella_header_$this_target_name",
]
}
}