Improve the logic to compile for Android #44949
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
m4gr3d
added
platform:android
topic:buildsystem
needs testing
cherrypick:3.x
|
I was able to test the changes on Windows and Mac, but could use more testing and validation to ensure there are no regressions. |
m4gr3d
pushed a commit
to m4gr3d/build-containers
that referenced
this pull request
Jan 5, 2021
Update configuration based on the Android buildsystem change in godotengine/godot#44949.
This was referenced Jan 5, 2021
…nd setting up the Android NDK if needed.
m4gr3d
force-pushed
the
specify_project_ndk_version
branch
from
cdefa24
to
eee213e
Compare
|
Tested locally on Linux, I run into this issue with This is with my pre-existing setup which used to work. It's not a "clean" setup and not the recommended one, but I think we should be able to preserve compat. I have: That I assume that was installed by I'd expect it to use the version pointed to by |
|
@akien-mga Can you check your |
Where should this file be if it exists? I don't find it in my SDK or NDK folders, nor in |
This comment has been minimized.
This comment has been minimized.
|
So after fixing my rootcerts, I still seem to have issues with JDK 11 and Gradle :( This is with a brand new SDK + NDK setup using the recommended workflow from the updated Godot docs. |
|
So I went back to OpenJDK 1.8.0 as I couldn't get OpenJDK 11.0 to behave (see previous comment). Now gradle works again, but it seems like Edit: I had only built armv7 release and debug templates, I guess gradle is now building the armv8 ones for me to pack both in each APK. That likely predates this PR which doesn't touch the gradle config much. Should be good to go then, let's merge. |
akien-mga
reviewed
Feb 5, 2021
| @@ -7,7 +7,8 @@ ext.versions = [ | |||
| supportCoreUtils : '1.0.0', | |||
| kotlinVersion : '1.4.10', | |||
| v4Support : '1.0.0', | |||
| javaVersion : 1.8 | |||
| javaVersion : 1.8, | |||
There was a problem hiding this comment.
That might be the reason for all my JDK 11 troubles :|
akien-mga
approved these changes
Feb 5, 2021
|
Thanks! |
|
Cherry-picked for 3.2.4. |
akien-mga
added
enhancement
and removed
cherrypick:3.x
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR automatically sets up the Android NDK (if needed) by using the
ANDROID_SDK_ROOTenvironment variable and the projectndkVersion.For regular users, this simplifies the setup process while ensuring the project is always compiled with a known working version of the NDK, while still retaining the capability for advanced users to modify it if needed.
Partially addresses #44055 (comment)
Note: The documentation will be updated to match.