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.

Sign up for GitHub

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

Jump to bottom

Update the environment variables used to access the Android NDK toolchain #1291

Merged
merged 1 commit into from
Nov 3, 2023
Merged

Update the environment variables used to access the Android NDK toolchain #1291

merged 1 commit into from
Nov 3, 2023

Conversation

m4gr3d
Copy link
Contributor

@m4gr3d m4gr3d commented Nov 1, 2023

  • Leverages the use of the ANDROID_HOME env variable as done in core
    • Provides a fallback to the previous env variable to avoid breaking existing setups
  • Aligns the ndk version with the one used in core

@m4gr3d m4gr3d added enhancement This is an enhancement on the current functionality platform:android topic:buildsystem Related to the buildsystem or CI setup labels Nov 1, 2023
@m4gr3d m4gr3d added this to the 4.2 milestone Nov 1, 2023
@m4gr3d m4gr3d requested a review from a team as a code owner November 1, 2023 16:28
@m4gr3d m4gr3d requested a review from BastiaanOlij November 1, 2023 16:28
@m4gr3d
Copy link
Contributor Author

m4gr3d commented Nov 1, 2023

@BastiaanOlij This PR addresses the issue referenced in GodotVR/godot_openxr_vendors#53 (comment)

@m4gr3d m4gr3d force-pushed the update_android_logic_to_retrieve_ndk_toolchain branch from 971062a to 86dbd5f Compare November 1, 2023 19:15
dsnopek
dsnopek reviewed Nov 2, 2023
View reviewed changes
Copy link
Collaborator

@dsnopek dsnopek left a comment

Choose a reason for hiding this comment

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

Thanks!

Overall, this looks good to me, but I think it needs to be sync'd with the latest changes from PR godotengine/godot#84316

tools/android.py Show resolved Hide resolved
tools/android.py Show resolved Hide resolved
@BastiaanOlij
Copy link
Collaborator

I'll let you guys discuss the details but can confirm this solves my compiling issue

@dsnopek dsnopek merged commit e4eee8b into godotengine:master Nov 3, 2023
12 checks passed
@dsnopek
Copy link
Collaborator

dsnopek commented Nov 3, 2023

Thanks!

@m4gr3d m4gr3d deleted the update_android_logic_to_retrieve_ndk_toolchain branch November 4, 2023 00:10
@dsnopek
Copy link
Collaborator

dsnopek commented Nov 10, 2023

Cherry-picked for 4.1 in PR #1306

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@dsnopek dsnopek dsnopek left review comments

@BastiaanOlij BastiaanOlij Awaiting requested review from BastiaanOlij

Assignees
No one assigned
Labels
enhancement This is an enhancement on the current functionality platform:android topic:buildsystem Related to the buildsystem or CI setup
Projects
None yet
Milestone
4.2
Development

Successfully merging this pull request may close these issues.
3 participants
@m4gr3d @BastiaanOlij @dsnopek