[NDK] Properly detect 64-bit NDK #133
Merged
Conversation
This file contains hidden or 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
The code detecting whether an instance of NDK is a 64-bit one assumed that the GNU binutils paths existed below the toolchains dir and used them to check whether the 64-bit platform directory exists under them in order to determine if the NDK is a 64-bit one. NDK r23, however, will remove the GNU binutils completely and those paths no longer exist. Add a check for the `toolchains/llvm/prebuilt/[PLATFORM]` directory existence before the older check so that detection works correctly for NDK r23+.
dellis1972
approved these changes
Aug 23, 2021
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.
The code detecting whether an instance of NDK is a 64-bit one assumed
that the GNU binutils paths existed below the toolchains dir and used
them to check whether the 64-bit platform directory exists under them in
order to determine if the NDK is a 64-bit one. NDK r23, however, will
remove the GNU binutils completely and those paths no longer exist.
Add a check for the
toolchains/llvm/prebuilt/[PLATFORM]directoryexistence before the older check so that detection works correctly for
NDK r23+.