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

build: fix ffmpeg gn gen #19127

Merged
merged 2 commits into from Jul 8, 2019
Merged

build: fix ffmpeg gn gen #19127

merged 2 commits into from Jul 8, 2019

Conversation

jkleinsc
Copy link
Contributor

@jkleinsc jkleinsc commented Jul 5, 2019

Description of Change

Somehow #19042 broke non proprietary ffmpeg GN gen. This PR fixes that. It also reverts #18993 because that PR introduced a security hole and prevented commits on linux and mac.

Checklist

Release Notes

Notes: no-notes

@jkleinsc jkleinsc requested a review from nornagon July 5, 2019 19:26
@zcbenz zcbenz merged commit e6a7a84 into master Jul 8, 2019
@release-clerk
Copy link

release-clerk bot commented Jul 8, 2019

No Release Notes

@zcbenz zcbenz deleted the fix-ffmpeg-gn-gen branch July 8, 2019 01:31
@@ -4,3 +4,4 @@ is_component_ffmpeg = true
is_official_build = true
proprietary_codecs = false
ffmpeg_branding = "Chromium"
enable_dsyms = false
Copy link
Member

Choose a reason for hiding this comment

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

hm, ideally we'd still generate symbols for this build, though i'm not sure we currently have a place to publish them.

seems like a good fix for now though 👍

... how come this didn't get caught by CI?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants