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.

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

chore: [gn] add desktop capturer sources to GN build #13286

Merged
merged 1 commit into from Jun 19, 2018

Conversation

Projects
None yet
4 participants
@nornagon
Copy link
Contributor

nornagon commented Jun 19, 2018

These files were made conditional in the GYP build in dee9aef, but the "gyp-to-gn" helper doesn't understand conditionals, so this just includes those files in the GN build in the same conditions as when they're included in the GYP build.

@nornagon nornagon requested a review from as a code owner Jun 19, 2018

@nornagon nornagon requested a review from alexeykuzmin Jun 19, 2018

@alexeykuzmin

This comment has been minimized.

Copy link
Contributor

alexeykuzmin commented Jun 19, 2018

@nornagon Do we already have a CI job to build Electron with GN?
It's probably only you who actually tries to do it and finds errors now =/

cc @jkleinsc

@ckerr ckerr merged commit e177117 into electron:master Jun 19, 2018

10 checks passed

WIP ready for review
Details
ci/circleci: electron-linux-arm Your tests passed on CircleCI!
Details
ci/circleci: electron-linux-arm-test Your tests passed on CircleCI!
Details
ci/circleci: electron-linux-arm64 Your tests passed on CircleCI!
Details
ci/circleci: electron-linux-arm64-test Your tests passed on CircleCI!
Details
ci/circleci: electron-linux-ia32 Your tests passed on CircleCI!
Details
ci/circleci: electron-linux-x64 Your tests passed on CircleCI!
Details
ci/circleci: electron-mas-x64 Your tests passed on CircleCI!
Details
ci/circleci: electron-osx-x64 Your tests passed on CircleCI!
Details
continuous-integration/appveyor/pr AppVeyor build succeeded
Details
@jkleinsc

This comment has been minimized.

Copy link
Contributor

jkleinsc commented Jun 19, 2018

@alexeykuzmin I'll add it as a todo.

@nornagon nornagon deleted the nornagon:gn-enable-desktop-capturer branch Jun 19, 2018

@nornagon

This comment has been minimized.

Copy link
Contributor Author

nornagon commented Jun 19, 2018

@alexeykuzmin i'm not too worried about it breaking every now and then for now, this wasn't intended to be passive-aggressive or blaming you for not also changing the GN build! CI would be great as soon as anyone else is using the GN build regularly, but until then it isn't urgent I don't think.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.