fix: bundle swiftshader and ANGLE libraries on mac #18870
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
3 tasks
|
I think this supersedes #18778 |
deepak1556
reviewed
Jun 19, 2019
| @@ -677,8 +722,10 @@ if (is_mac) { | |||
| ":electron_lib", | |||
| ] | |||
| deps = [ | |||
| ":electron_angle_library", | |||
There was a problem hiding this comment.
Any reason to isolate these in targets like electron_angle_library, electron_swiftshader_library ? Can't they be combined into electron_framework_libraries ?
There was a problem hiding this comment.
I just copy/pasted this from content_shell. Left it the same because that was easiest 🤷♂
zcbenz
approved these changes
Jun 19, 2019
codebytere
approved these changes
Jun 19, 2019
|
Release Notes Persisted
|
|
I was unable to backport this PR to "6-0-x" cleanly; |
|
@nornagon can you please backport this to 6? |
|
A maintainer has manually backported this PR to "6-0-x", please check out #18904 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description of Change
Fixes #18639. Not sure what exactly caused this to start breaking now, but these libraries appeared in https://chromium-review.googlesource.com/c/chromium/src/+/955949/ and got enabled by default on mac here https://chromium-review.googlesource.com/c/chromium/src/+/1005017/. The call during gpu process startup that was causing this crash was added here https://chromium-review.googlesource.com/c/chromium/src/+/1599993.
Checklist
npm testpassesRelease Notes
Notes: Fixed crash when starting with
--disable-gpu.