Skip to content

Commit f381d32

Browse files
committed
try fix no NDK arm-linux-androideabi-gcc on $PATH at (eval 10) line 143.
1 parent 10485bb commit f381d32

File tree

2 files changed

+14
-5
lines changed

2 files changed

+14
-5
lines changed

do-compile/android/openssl.sh

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ case $_MR_ARCH in
5050
;;
5151
esac
5252

53-
CFG_FLAGS="no-shared no-engine no-dynamic-engine no-static-engine \
53+
CFG_FLAGS="no-shared no-engine no-apps no-dynamic-engine no-static-engine \
5454
no-dso no-ui-console no-tests \
5555
--prefix=$MR_BUILD_PREFIX \
5656
--openssldir=$MR_BUILD_PREFIX \
@@ -74,6 +74,7 @@ else
7474
echo "[*] configurate"
7575
echo "C_FLAGS: $C_FLAGS"
7676
echo "Openssl CFG: $CFG_FLAGS"
77+
echo "PATH: $PATH"
7778
echo "----------------------"
7879

7980
export C_FLAGS="$C_FLAGS"
@@ -83,6 +84,9 @@ else
8384
export AS="$MR_AS"
8485
export RANLIB="$MR_RANLIB"
8586
export STRIP="$MR_STRIP"
87+
export ANDROID_NDK_ROOT="$MR_ANDROID_NDK_HOME"
88+
89+
8690
./Configure $CFG_FLAGS
8791
fi
8892

tools/export-android-build-env.sh

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -56,15 +56,20 @@ export MR_BUILD_SOURCE="${MR_SRC_ROOT}/${REPO_DIR}-${_MR_ARCH}"
5656
# android/fftutorial-x86_64
5757
export MR_BUILD_PREFIX="${MR_PRODUCT_ROOT}/${LIB_NAME}-${_MR_ARCH}"
5858

59-
if [ -z "$ANDROID_NDK_HOME" ]; then
59+
if [[ -n "$ANDROID_NDK_HOME" ]];then
60+
export MR_ANDROID_NDK_HOME="$ANDROID_NDK_HOME"
61+
elif [[ -n "$ANDROID_NDK_ROOT" ]]; then
62+
export MR_ANDROID_NDK_HOME="$ANDROID_NDK_ROOT"
63+
elif [[ -n "$ANDROID_NDK" ]]; then
64+
export MR_ANDROID_NDK_HOME="$ANDROID_NDK"
65+
else
6066
echo "You must define ANDROID_NDK_HOME before starting."
6167
echo "They must point to your NDK directories.\n"
6268
exit 1
63-
else
64-
export MR_NDK_REL=$(grep -m 1 -o '^## r[0-9]*.*' $ANDROID_NDK_HOME/CHANGELOG.md | awk '{print $2}')
6569
fi
6670

67-
export MR_ANDROID_NDK_HOME="$ANDROID_NDK_HOME"
71+
export MR_NDK_REL=$(grep -m 1 -o '^## r[0-9]*.*' $MR_ANDROID_NDK_HOME/CHANGELOG.md | awk '{print $2}')
72+
6873
export MR_TOOLCHAIN_ROOT="$MR_ANDROID_NDK_HOME/toolchains/llvm/prebuilt/${MR_HOST_TAG}"
6974
export PATH="${MR_TOOLCHAIN_ROOT}/bin:$PATH"
7075
export MR_SYS_ROOT="${MR_TOOLCHAIN_ROOT}/sysroot"

0 commit comments

Comments
 (0)