@@ -13,7 +13,9 @@ if [ "$1" == "fdroid" ]; then
1313 MUPDF_FOLDER=$MUPDF_FOLDER -fdroid
1414fi
1515
16- git clone --recursive git://git.ghostscript.com/mupdf.git --branch $VERSION_TAG $MUPDF_FOLDER
16+ if [ ! -d " $MUPDF_FOLDER /.git" ]; then
17+ git clone --recursive https://git.ghostscript.com/mupdf.git --branch $VERSION_TAG $MUPDF_FOLDER
18+ fi
1719
1820MUPDF_ROOT=$BUILD_DIR /$MUPDF_FOLDER
1921
123125
124126PATH1=/Users/ivanivanenko/Library/Android/sdk/ndk
125127PATH2=/home/dev/Android/Sdk/ndk
128+ PATH3=$ANDROID_HOME /ndk
126129
127130if [ ! -d " $PATH1 /$NDK_VERSION " ]; then
128131 echo " -- NDK ERROR --"
@@ -144,7 +147,7 @@ if [ "$1" == "clean_ndk" ]; then
144147fi
145148
146149if [ " $1 " == " fdroid" ]; then
147- for NDK in " $PATH1 /$FDRIOD_NDK_VERSION /ndk-build" " $PATH2 /$FDRIOD_NDK_VERSION /ndk-build" ;
150+ for NDK in " $ANDROID_NDK_HOME /ndk-build " " $ PATH1 /$FDRIOD_NDK_VERSION /ndk-build" " $PATH2 / $FDRIOD_NDK_VERSION /ndk-build " " $PATH3 /$FDRIOD_NDK_VERSION /ndk-build" ;
148151 do
149152 if [ -f " $NDK " ]; then
150153 $NDK NDK_APPLICATION_MK=jni/Application.mk APP_ABI=armeabi-v7a APP_PLATFORM=android-24 &
@@ -157,7 +160,7 @@ if [ "$1" == "fdroid" ]; then
157160 fi
158161 done
159162else
160- for NDK in " $PATH1 /$NDK_VERSION /ndk-build" " $PATH2 /$NDK_VERSION /ndk-build" ;
163+ for NDK in " $ANDROID_NDK_HOME /ndk-build " " $ PATH1 /$NDK_VERSION /ndk-build" " $PATH2 / $NDK_VERSION /ndk-build " " $PATH3 /$NDK_VERSION /ndk-build" ;
161164 do
162165 if [ -f " $NDK " ]; then
163166 $NDK NDK_APPLICATION_MK=jni/Application.mk APP_ABI=armeabi-v7a APP_PLATFORM=android-24 &
@@ -176,4 +179,4 @@ echo "=================="
176179echo " MUPDF:" $MUPDF_JAVA
177180echo " JNI:" $LIBS
178181echo " =================="
179- fi
182+ fi
0 commit comments