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

Updated to ndk 13b #13

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Updated to ndk 13b #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions env
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ export ANDROID_TOOL_PREFIX="${BASE}/build-tools"
export ANDROID_TEST_PREFIX="${BASE}/build-vm"

# SDKs and target platforms.
export NDK_REL=android-ndk-r10d
export NDK_REL=android-ndk-r13b
export SDK_REL=android-sdk-r24.0.2
export NDK_REV=10d
export NDK_REV=13b
export SDK_REV=24.0.2
export ANDROID_API_LEVEL=21
export ANDROID_PLATFORM=arm
Expand Down
11 changes: 10 additions & 1 deletion mk/build_ndk.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,15 @@ case "${NDK_REV}" in
popd
fi
;;
13*)
NDK_ARCHIVE="$BASE/sdk/android-ndk-r${NDK_REV}-$(uname -s | tr '[A-Z]' '[a-z]')-${NDK_ARCH}.zip"
if [[ ! -d "${BASE}/sdk/${NDK_REL}" ]]; then
# Zip archive.
pushd "${BASE}/sdk"
unzip "${NDK_ARCHIVE}" || exit 1
popd
fi
;;
*)
NDK_ARCHIVE="$BASE/sdk/android-ndk-r${NDK_REV}-$(uname -s | tr '[A-Z]' '[a-z]')-${NDK_ARCH}.tar.bz2"
if [[ ! -d "${BASE}/sdk/${NDK_REL}" ]]; then
Expand All @@ -40,6 +49,6 @@ case "${NDK_REV}" in
esac

if [[ ! -f "${ANDROID_PREFIX}/.built-ndk-${BUILD_IDENTIFIER}" ]]; then
("${BASE}/sdk/${NDK_REL}/build/tools/make-standalone-toolchain.sh" --platform="android-${ANDROID_API_LEVEL}" --install-dir="${ANDROID_TOOL_PREFIX}/${BUILD_IDENTIFIER}" --toolchain="${ANDROID_TOOLCHAIN}" &&\
("${BASE}/sdk/${NDK_REL}/build/tools/make-standalone-toolchain.sh" --force --platform="android-${ANDROID_API_LEVEL}" --install-dir="${ANDROID_TOOL_PREFIX}/${BUILD_IDENTIFIER}" --toolchain="${ANDROID_TOOLCHAIN}" &&\
touch "${ANDROID_PREFIX}/.built-ndk-${BUILD_IDENTIFIER}") || exit 1
fi
14 changes: 13 additions & 1 deletion mk/ndk_source.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,25 @@ case $(uname -m) in
;;
esac

# NOTE: For newer is seems that we require to unzip
case "${NDK_REV}" in
10*)
NDK_EXT=bin
;;
13*)
NDK_EXT=zip
;;
*)
NDK_EXT=tar.bz2
;;
esac

echo http://dl.google.com/android/ndk/android-ndk-r${NDK_REV}-$(uname -s | tr '[A-Z]' '[a-z'])-${NDK_ARCH}.${NDK_EXT}

case "${NDK_EXT}" in
zip)
echo http://dl.google.com/android/repository//android-ndk-r${NDK_REV}-$(uname -s | tr '[A-Z]' '[a-z'])-${NDK_ARCH}.${NDK_EXT}
;;
*)
echo http://dl.google.com/android/ndk/android-ndk-r${NDK_REV}-$(uname -s | tr '[A-Z]' '[a-z'])-${NDK_ARCH}.${NDK_EXT}
;;
esac