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

Fixes to android build. Add option to turn LuaJIT on/off for testing purposes #12334

Merged
merged 2 commits into from
May 21, 2022

Conversation

paradust7
Copy link
Contributor

Related to #12062

  1. Added an annotation to GameActivity.java that is needed to make the Release build work with the newer Android toolchains that have minification.

  2. Added the ability to switch between LuaJIT and PUC Lua. This was helpful for determining where the problem crash was occurring. This includes a fix to lib/lua/src/lgc.c which is needed to prevent a miscompile.

@sfan5 sfan5 added @ Build CMake, build scripts, official builds, compiler and linker errors Android Bugfix 🐛 PRs that fix a bug labels May 15, 2022
@sfan5
Copy link
Member

sfan5 commented May 18, 2022

Can you extract the lgc.c change into a separate commit for better change tracking?

@paradust7
Copy link
Contributor Author

Created separate PR: #12347

Copy link
Member

@sfan5 sfan5 left a comment

Choose a reason for hiding this comment

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

Looks good otherwise.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Android Bugfix 🐛 PRs that fix a bug @ Build CMake, build scripts, official builds, compiler and linker errors >= Two approvals ✅ ✅
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants