8000 Found a problem with the way we extract and move the NDK. This shoul… · rave-engine/python3-android@57eecb5 · GitHub
[go: up one dir, main page]
Skip to content

Commit 57eecb5

Browse files
GRRedWingsGRRedWings
committed
Found a problem with the way we extract and move the NDK. This should fix it.
1 parent 5b181bc commit 57eecb5

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

‎mk/build_ndk.sh

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,11 @@ esac
1717

1818
[[ ! -d "${ANDROID_PREFIX}/.built-${BUILD_IDENTIFIER}" ]] && (mkdir -p "${ANDROID_PREFIX}/.built-${BUILD_IDENTIFIER}" || exit 1)
1919
[[ ! -d "${ANDROID_TOOL_PREFIX}/${BUILD_IDENTIFIER}" ]] && (mkdir -p "${ANDROID_TOOL_PREFIX}/${BUILD_IDENTIFIER}" || exit 1)
20-
[[ ! -d "${BASE}/sdk/${NDK_REL}" ]] && (chmod a+x "$BASE/sdk/android-ndk-r${NDK_REV}-$(uname -s | tr '[A-Z]' '[a-z]')-${NDK_ARCH}.bin" || exit 1)
21-
[[ ! -d "${BASE}/sdk/${NDK_REL}" ]] && ("$BASE/sdk/android-ndk-r${NDK_REV}-$(uname -s | tr '[A-Z]' '[a-z]')-${NDK_ARCH}.bin" || exit 1)
2220

23-
[[ ! -d "${BASE}/sdk/${NDK_REL}" ]] && ("mv -f $BASE/android-ndk-r${NDK_REV} $BASE/sdk/android-ndk-r${NDK_REV}" || exit 1)
21+
[[ ! -d "$BASE/sdk/android-ndk-r${NDK_REV}-$(uname -s | tr '[A-Z]' '[a-z]')-${NDK_ARCH}.bin" ]] && (chmod a+x "$BASE/sdk/android-ndk-r${NDK_REV}-$(uname -s | tr '[A-Z]' '[a-z]')-${NDK_ARCH}.bin" || exit 1)
22+
[[ ! -d "$BASE/sdk/android-ndk-r${NDK_REV}-$(uname -s | tr '[A-Z]' '[a-z]')-${NDK_ARCH}.bin" ]] && ("$BASE/sdk/android-ndk-r${NDK_REV}-$(uname -s | tr '[A-Z]' '[a-z]')-${NDK_ARCH}.bin" || exit 1)
23+
24+
[[ ! -d "$BASE/android-ndk-r${NDK_REV}" ]] && ("mv -f $BASE/android-ndk-r${NDK_REV} $BASE/sdk/android-ndk-r${NDK_REV}" || exit 1)
2425

2526
if [[ ! -f "${ANDROID_PREFIX}/.built-ndk-${BUILD_IDENTIFIER}" ]]; then
2627
("${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}" &&\

0 commit comments

Comments
 (0)
0