Skip to content

Commit

Permalink
bump NDK version to r26b.
Browse files Browse the repository at this point in the history
  • Loading branch information
atsushieno committed Nov 9, 2023
1 parent dd4b3f4 commit 83fa3d5
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 6 deletions.
2 changes: 1 addition & 1 deletion gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ accompanist-drawablepainter = "0.30.1"
accompanist-permissions = "0.30.1"
agp = "8.1.2"
kotlin = "1.8.10"
ndk = "25.2.9519653"
ndk = "26.1.10909125"
cmake = "3.22.1"
build-tools = "33.0.1"
dokka = "1.8.10"
Expand Down
13 changes: 8 additions & 5 deletions setup-asan-for-debugging.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

# This shell script is to set up ASAN for debugging native libs.
# Specify your own path in those variables below.
# Note that ASAN is *deprecated in Android 14 or later (use HWAsan instead).

# They have to be adjusted to your environment and NDK version.
# Although note that whenever we use AAP the NDK version has to be fixed to
Expand All @@ -12,16 +13,18 @@
#
if [ "$ANDROID_NDK_PATH" == "" ]; then
if [ `uname` == "Darwin" ]; then
ANDROID_NDK_PATH=~/Library/Android/Sdk/ndk/25.1.8937393
ANDROID_NDK_PATH=~/Library/Android/Sdk/ndk/26.1.10909125
else
ANDROID_NDK_PATH=~/Android/Sdk/ndk/25.1.8937393
ANDROID_NDK_PATH=~/Android/Sdk/ndk/26.1.10909125
fi
fi
UNAMEXX=`uname | tr '[:upper:]' '[:lower:]'`
echo "UNAME: $UNAMEXX"
HOST_ARCH_LIB=$UNAMEXX-x86_64/lib64
CLANG_VER=14.0.6
# Note that these paths may not work depending on the NDK versions. Always make sure that the resulting paths exist
HOST_ARCH_LIB=$UNAMEXX-x86_64/lib
CLANG_VER=17
CLANG_LIB=$ANDROID_NDK_PATH/toolchains/llvm/prebuilt/$HOST_ARCH_LIB/clang/$CLANG_VER/lib
echo "UNAME: $UNAMEXX"
echo "CLANG_LIB: $CLANG_LIB"

ALL_ABIS=("x86" "x86_64" "armeabi-v7a" "arm64-v8a")

Expand Down

0 comments on commit 83fa3d5

Please sign in to comment.