Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: remove usage of private APIs in the MAS build #17224

Merged
merged 4 commits into from Mar 8, 2019
Merged

fix: remove usage of private APIs in the MAS build #17224

merged 4 commits into from Mar 8, 2019

Conversation

MarshallOfSound
Copy link
Member

@MarshallOfSound MarshallOfSound commented Mar 4, 2019 •
edited

Description of Change

This PR introduces patches to remove / replace usages of private APIs used in the MAS build.

Please note this PR includes 3 separate patches each solving their own problem, it would probably make sense to rebase and merge this rather than squash and merge in order to retain history.

Fixes #17197

Release Notes

Notes: Fixed some MAS rejection errors by removing usages of private APIs

@electron-cation electron-cation bot added the new-pr 🌱 PR opened in the last 24 hours label Mar 4, 2019
@MarshallOfSound MarshallOfSound changed the title Fix mas build 73 fix: remove usage of private APIs in the MAS build Mar 4, 2019
nornagon
nornagon approved these changes Mar 5, 2019
View reviewed changes
...hes/common/chromium/fix_disable_usage_of_pthread_fchdir_np_and_pthread_chdir_np_in_mas.patch
From: Samuel Attard <sattard@slack-corp.com>
Date: Mon, 4 Mar 2019 14:46:48 -0800
Subject: fix: disable usage of pthread_fchdir_np and pthread_chdir_np in MAS
builds
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

hrrrrm is this what export-patches produced? the 2-line subject line is probably gonna cause issues

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yup, this is exactly what the script produced. It looks like the builds are OK and handle it though?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

hmmm... does it survive import-patches && export-patches? if not, might have to kick the export-patches script

patches/common/chromium/fix_disable_usage_of_setapplicationisdaemon_and.patch
From: Samuel Attard <sattard@slack-corp.com>
Date: Mon, 4 Mar 2019 14:51:45 -0800
Subject: fix: disable usage of SetApplicationIsDaemon and
_LSSetApplicationLaunchServicesServerConnectionStatus in MAS builds
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

here too

codebytere
codebytere approved these changes Mar 5, 2019
View reviewed changes
Copy link
Member

@codebytere codebytere left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

@deepak1556
Copy link
Member

@nornagon we already have disabled seatbelt for MAS builds, wouldn't it better if we add dummy build groups for targets in //sandbox/mac under is_mas_build which will also achieve the same purpose but simplify the patch set we have.

@nornagon
Copy link
Member

nornagon commented Mar 5, 2019

@deepak1556 would we have to provide stubs for functions/classes that other modules depend on? If so, that seems like it might not actually be easier, since we'd have to track that API.

@electron-cation electron-cation bot removed the new-pr 🌱 PR opened in the last 24 hours label Mar 5, 2019
@MarshallOfSound MarshallOfSound requested a review from a team as a code owner March 7, 2019 23:33
@codebytere
Copy link
Member

@MarshallOfSound

/home/builduser/project/src/electron/lib/renderer/web-view/web-view-attributes.ts
  58:29  error  '_args' is defined but never used  @typescript-eslint/no-unused-vars

/home/builduser/project/src/electron/lib/renderer/web-view/web-view-element.ts
  12:10  error  'WebViewImpl' is defined but never used  @typescript-eslint/no-unused-vars

@MarshallOfSound
Copy link
Member Author

@codebytere Rebased on master to fix those issues 👍

@nornagon nornagon merged commit 9d8619f into master Mar 8, 2019
@release-clerk
Copy link

release-clerk bot commented Mar 8, 2019

Release Notes Persisted

Fixed some MAS rejection errors by removing usages of private APIs

@nornagon nornagon deleted the fix-mas-build-73 branch March 8, 2019 18:09
@nornagon
Copy link
Member

nornagon commented Mar 8, 2019

/trop run backport-to 5-0-x

@trop
Copy link
Contributor

trop bot commented Mar 8, 2019

The backport process for this PR has been manually initiated,
sending your 1's and 0's to "5-0-x" here we go! :D

@trop trop bot mentioned this pull request Mar 8, 2019
Merged
@trop
Copy link
Contributor

trop bot commented Mar 8, 2019

I have automatically backported this PR to "5-0-x", please check out #17293

kiku-jw pushed a commit to kiku-jw/electron that referenced this pull request May 16, 2019
@MarshallOfSound @kiku-jw
fix: remove usage of private APIs in the MAS build (electron#17224)
01c7cb0 
* fix: remove usage of abort_report_np in MAS builds

* fix: remove usage of pthread_chdir in MAS builds

* fix: remove usage of setapplicationisdaemon in MAS builds

* chore: update patch manifest
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@nornagon nornagon nornagon approved these changes

@codebytere codebytere codebytere approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@MarshallOfSound @deepak1556 @nornagon @codebytere