Commit ac774b19 authored by Rohit Rao's avatar Rohit Rao Committed by Commit Bot

[ios] Bundle additional libraries when building with custom WebKit.

Without these, dyld will load some custom-built frameworks and some
system frameworks, leading to a crash due to the mismatch.

BUG=934252

Change-Id: I9a5b22915a8252f193452d4d874e5f7b9ea72198
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1849212Reviewed-by: default avatarAli Juma <ajuma@chromium.org>
Commit-Queue: Rohit Rao <rohitrao@chromium.org>
Cr-Commit-Position: refs/heads/master@{#704169}
parent 52561877
...@@ -64,6 +64,14 @@ if (_build_custom_webkit) { ...@@ -64,6 +64,14 @@ if (_build_custom_webkit) {
"$_framework_out_dir/WebKit.framework/WebKit", "$_framework_out_dir/WebKit.framework/WebKit",
"$_framework_out_dir/WebKitLegacy.framework", "$_framework_out_dir/WebKitLegacy.framework",
"$_framework_out_dir/WebKitLegacy.framework/WebKitLegacy", "$_framework_out_dir/WebKitLegacy.framework/WebKitLegacy",
"$_framework_out_dir/com.apple.WebKit.Networking.xpc",
"$_framework_out_dir/com.apple.WebKit.Networking.xpc/com.apple.WebKit.Networking.Development",
"$_framework_out_dir/com.apple.WebKit.Plugin.64.xpc",
"$_framework_out_dir/com.apple.WebKit.Plugin.64.xpc/com.apple.WebKit.Plugin.64.Development",
"$_framework_out_dir/com.apple.WebKit.WebContent.Development.xpc",
"$_framework_out_dir/com.apple.WebKit.WebContent.Development.xpc/com.apple.WebKit.WebContent.Development.Development",
"$_framework_out_dir/com.apple.WebKit.WebContent.xpc",
"$_framework_out_dir/com.apple.WebKit.WebContent.xpc/com.apple.WebKit.WebContent.Development",
] ]
# TODO(crbug.com/934252): "-j 4" restricts xcodebuild to four simultaneous # TODO(crbug.com/934252): "-j 4" restricts xcodebuild to four simultaneous
...@@ -91,6 +99,10 @@ if (_build_custom_webkit) { ...@@ -91,6 +99,10 @@ if (_build_custom_webkit) {
"$_framework_out_dir/WebCore.framework", "$_framework_out_dir/WebCore.framework",
"$_framework_out_dir/WebKit.framework", "$_framework_out_dir/WebKit.framework",
"$_framework_out_dir/WebKitLegacy.framework", "$_framework_out_dir/WebKitLegacy.framework",
"$_framework_out_dir/com.apple.WebKit.Networking.xpc",
"$_framework_out_dir/com.apple.WebKit.Plugin.64.xpc",
"$_framework_out_dir/com.apple.WebKit.WebContent.Development.xpc",
"$_framework_out_dir/com.apple.WebKit.WebContent.xpc",
] ]
outputs = [ outputs = [
"{{bundle_contents_dir}}/WebKitFrameworks/{{source_file_part}}", "{{bundle_contents_dir}}/WebKitFrameworks/{{source_file_part}}",
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment