Fix NDK path detection #103
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
ofalvai
commented
Apr 24, 2024
| inputs: | ||
| - content: |- | ||
| #!/usr/bin/env bash | ||
| sdkmanager --uninstall "extras;android;m2repository" |
There was a problem hiding this comment.
This was only a problem in very old Android Gradle Plugin versions. This even predates the support library vs. AndroidX migration thing. I don't think it's needed anymore, and it would be almost impossible to set up a working project that tests this successfully (this needs an old AGP version, which needs an old Gradle version, which needs JDK8, etc.)
koral--
reviewed
Apr 24, 2024
lpusok
reviewed
Apr 25, 2024
| if androidHome := envRepo.Get("ANDROID_HOME"); androidHome != "" { | ||
| // The most modern way is to install NDK versions side-by-side at $ANDROID_HOME/ndk/version | ||
| // This is what `sdkmanager` does when installing a specific version (`sdkmanager "ndk;26.3.11579264"`). | ||
| ndkPath := filepath.Join(androidHome, "ndk", requestedNDKVersion) |
There was a problem hiding this comment.
This will only work if specifying the exact version number right? Dunno if it is a problem
There was a problem hiding this comment.
The whole thing only works with exact numbers because that's what is recorded in source.properties and that's what sdkmanager --install expects unfortunately.
lpusok
approved these changes
Apr 25, 2024
1 task
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.
Checklist
step.ymlandREADME.mdis updated with the changes (if needed)Version
Requires a PATCH version update
Context
NDK installation and configuration has changed a lot over the years: https://github.com/android/ndk-samples/wiki/Configure-NDK-Path#the-default-ndk-location
It's also installed incorrectly on the Ubuntu 20 stack, which we fixed on Ubuntu 22. This in turn broke this step, which assumed the incorrect install location of the Ubuntu 20 stack (see #102)
Changes
Clean up and rework the NDK location detection logic. I tried to comment the code as much as possible to preserve the reasoning.
Investigation details
Decisions