summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--README.md2
-rwxr-xr-xscripts/build_deps.sh5
-rwxr-xr-xscripts/prepareForDistribution.sh2
3 files changed, 6 insertions, 3 deletions
diff --git a/README.md b/README.md
index fbf172cc..97803817 100644
--- a/README.md
+++ b/README.md
@@ -82,7 +82,7 @@ You can download Android studio here:
https://developer.android.com/studio/index.html
-Once you've got it installed, use the `SDK Manager` tool (Android figure Icon with blue arrow second from the right in the tool pane) to download all the Android SDK and NDK depencencies listed above.
+Once you've got it installed, use the `SDK Manager` tool (Android figure Icon with blue arrow second from the right in the tool pane) to download all the Android SDK and NDK dependencies listed above.
#### With Bash <a name="with-bash"></a>
diff --git a/scripts/build_deps.sh b/scripts/build_deps.sh
index 0d37d7de..d1d42576 100755
--- a/scripts/build_deps.sh
+++ b/scripts/build_deps.sh
@@ -27,6 +27,9 @@ cd $BASE_DIR
if [[ $(ls -A ${ANDROID_HOME}/ndk/${EXPECTED_NDK_VERSION}) ]]
then
ANDROID_NDK_HOME=${ANDROID_HOME}/ndk/${EXPECTED_NDK_VERSION}
+elif [[ -f ${ANDROID_HOME/android-ndk-}${EXPECTED_ANDOID_NDK_RELEASE_VERSION }} ]]; then
+ echo "make sure you have the right ndk version installed and paths are set correctly"
+ exit 1
else
# ndk was manually downloaded from http://dl.google.com/android/repository
ANDROID_NDK_HOME=${ANDROID_HOME}/android-ndk-${EXPECTED_ANDROID_NDK_RELEASE_VERSION}
@@ -98,4 +101,4 @@ else
cp lib/bitmaskcore_x86_64.aar ../lib-bitmask-core-x86_64/.
cp lib/bitmaskcore_x86_64-sources.jar ../lib-bitmask-core-x86_64/.
cd ..
-fi \ No newline at end of file
+fi
diff --git a/scripts/prepareForDistribution.sh b/scripts/prepareForDistribution.sh
index e6c0d42d..b89b73aa 100755
--- a/scripts/prepareForDistribution.sh
+++ b/scripts/prepareForDistribution.sh
@@ -409,7 +409,7 @@ if [[ ${DO_BUILD} == true ]]; then
fi
else
# default: neither -aab nor -apk is passed: build apks
- if ([[ -z ${BUILD_BUNDLE} ]] && [[-z ${BUILD_APK} ]]) || ([[ -n ${BUILD_APK} ]]); then
+ if ([[ -z ${BUILD_BUNDLE} ]] && [[ -z ${BUILD_APK} ]]) || ([[ -n ${BUILD_APK} ]]); then
if [[ -z ${FLAVOR2} ]]; then
echo -e "${GREEN} -> build stable releases (.apk) for flavor ${FLAVOR}${NC}"
else