File tree Expand file tree Collapse file tree 2 files changed +14
-5
lines changed Expand file tree Collapse file tree 2 files changed +14
-5
lines changed Original file line number Diff line number Diff line change @@ -50,7 +50,7 @@ case $_MR_ARCH in
50
50
;;
51
51
esac
52
52
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 \
54
54
no-dso no-ui-console no-tests \
55
55
--prefix=$MR_BUILD_PREFIX \
56
56
--openssldir=$MR_BUILD_PREFIX \
74
74
echo " [*] configurate"
75
75
echo " C_FLAGS: $C_FLAGS "
76
76
echo " Openssl CFG: $CFG_FLAGS "
77
+ echo " PATH: $PATH "
77
78
echo " ----------------------"
78
79
79
80
export C_FLAGS=" $C_FLAGS "
83
84
export AS=" $MR_AS "
84
85
export RANLIB=" $MR_RANLIB "
85
86
export STRIP=" $MR_STRIP "
87
+ export ANDROID_NDK_ROOT=" $MR_ANDROID_NDK_HOME "
88
+
89
+
86
90
./Configure $CFG_FLAGS
87
91
fi
88
92
Original file line number Diff line number Diff line change @@ -56,15 +56,20 @@ export MR_BUILD_SOURCE="${MR_SRC_ROOT}/${REPO_DIR}-${_MR_ARCH}"
56
56
# android/fftutorial-x86_64
57
57
export MR_BUILD_PREFIX=" ${MR_PRODUCT_ROOT} /${LIB_NAME} -${_MR_ARCH} "
58
58
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
60
66
echo " You must define ANDROID_NDK_HOME before starting."
61
67
echo " They must point to your NDK directories.\n"
62
68
exit 1
63
- else
64
- export MR_NDK_REL=$( grep -m 1 -o ' ^## r[0-9]*.*' $ANDROID_NDK_HOME /CHANGELOG.md | awk ' {print $2}' )
65
69
fi
66
70
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
+
68
73
export MR_TOOLCHAIN_ROOT=" $MR_ANDROID_NDK_HOME /toolchains/llvm/prebuilt/${MR_HOST_TAG} "
69
74
export PATH=" ${MR_TOOLCHAIN_ROOT} /bin:$PATH "
70
75
export MR_SYS_ROOT=" ${MR_TOOLCHAIN_ROOT} /sysroot"
You can’t perform that action at this time.
0 commit comments