File tree Expand file tree Collapse file tree 1 file changed +5
-6
lines changed
Expand file tree Collapse file tree 1 file changed +5
-6
lines changed Original file line number Diff line number Diff line change @@ -141,15 +141,14 @@ function push_arm() {
141141 PYPLATFORM=" linux"
142142 fi
143143
144- if [ " X${ANDROIDNDKVER: 0: 2} " == " Xr7" ] || [ " X$ANDROIDNDKVER " == " Xr8" ]; then
145- export TOOLCHAIN_PREFIX=arm-linux-androideabi
146- export TOOLCHAIN_VERSION=4.4.3
147- elif [ " X$ANDROIDNDKVER " == " Xr5b" ]; then
144+ if [ " X$ANDROIDNDKVER " == " Xr5b" ]; then
148145 export TOOLCHAIN_PREFIX=arm-eabi
149146 export TOOLCHAIN_VERSION=4.4.0
150147 else
151- error " Unable to configure NDK toolchain for NDK $ANDROIDNDKVER "
152- exit -1
148+ # if [ "X${ANDROIDNDKVER:0:2}" == "Xr7" ] || [ "X$ANDROIDNDKVER" == "Xr8" ]; then
149+ # assume this toolchain is the same for all the next ndk... until a new one is out.
150+ export TOOLCHAIN_PREFIX=arm-linux-androideabi
151+ export TOOLCHAIN_VERSION=4.4.3
153152 fi
154153
155154 export PATH=" $ANDROIDNDK /toolchains/$TOOLCHAIN_PREFIX -$TOOLCHAIN_VERSION /prebuilt/$PYPLATFORM -x86/bin/:$ANDROIDNDK :$ANDROIDSDK /tools:$PATH "
You can’t perform that action at this time.
0 commit comments