Add support for NDK r25 #44
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
Includes a few tweaks needed to build bpftools with a recent NDK: - Libcxx prebuilts are no longer included in sources/cxx-stl [1], so use the sysroot path instead. - NDK now defaults to android-legacy.toolchain.cmake [2], irrespective of CMake version. With the legacy toolchain some env variables we set such as LDFLAGS aren't used, leading to build errors. Force the use of new toolchain file and switch to CXXFLAGS as opposed to CMAKE_CXX_FLAGS to avoid overriding toolchain defaults [3]. Test: make NDK_PATH=/opt/ndk/android-ndk-r25c bpftools-min [1] https://android-review.googlesource.com/c/platform/ndk/+/2051541 [2] https://android-review.googlesource.com/c/platform/ndk/+/2064269 [3] android/ndk#1693
facebook-github-bot
added
the
CLA Signed
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.
Includes a few tweaks needed to build bpftools with a recent NDK:
Test: make NDK_PATH=/opt/ndk/android-ndk-r25c bpftools-min
[1] https://android-review.googlesource.com/c/platform/ndk/+/2051541
[2] https://android-review.googlesource.com/c/platform/ndk/+/2064269
[3] android/ndk#1693