diff options
| author | cyberta <cyberta@riseup.net> | 2022-11-11 23:11:30 +0000 |
|---|---|---|
| committer | cyberta <cyberta@riseup.net> | 2022-11-11 23:11:30 +0000 |
| commit | 3206f3d5a24669d53e6e1502d38c18dc07bd9f3a (patch) | |
| tree | 62ff704d3dbcb0b797add88ceac7de765eb49853 | |
| parent | 5b9505dbb37d110b8c528671bbfc67f7944d2e43 (diff) | |
| parent | 0a2a82a73546f157611e9706df8bca3122a6684c (diff) | |
Merge branch 'dev-setup-help' into 'master'
more help for first-time devs
See merge request leap/bitmask_android!212
| -rwxr-xr-x | scripts/build_deps.sh | 3 | ||||
| -rwxr-xr-x | scripts/prepareForDistribution.sh | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/scripts/build_deps.sh b/scripts/build_deps.sh index 0d37d7de..e52a4401 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} 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 |