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/android: fix ffmpeg and openssl build scripts #74

Merged
merged 2 commits into from
Sep 18, 2014

Conversation

waninkoko
Copy link

This commit adds support to compile openssl for every arch (it was only building it for armv7a). It also fixes a typo and a compilation issue when openssl is enabled in FFmpeg.

@bbcallen
Copy link
Contributor

Looks good to me except the tools/do-compile-openssl.sh is missing.

And do you mind if I license these files under Apache License 2.0 later?

@waninkoko
Copy link
Author

Ooops, probably forgot to add it, I'll fix it asap. And no problem to license the files under Apache License.

@waninkoko
Copy link
Author

Script added.

bbcallen added a commit that referenced this pull request Sep 18, 2014
build/android: fix ffmpeg and openssl build scripts
@bbcallen bbcallen merged commit d0ff1ed into bilibili:master Sep 18, 2014
@bbcallen
Copy link
Contributor

Merged, thanks

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