Skip to content

Commit ea6fc08

Browse files
committed
qt6: use different build image name, different buildozer work dir
1 parent 8b6dbc7 commit ea6fc08

1 file changed

Lines changed: 4 additions & 4 deletions

File tree

contrib/android/build.sh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@ fi
2828

2929
# create symlink
3030
rm -f ${PROJECT_ROOT}/.buildozer
31-
mkdir -p "${PROJECT_ROOT}/.buildozer_$1"
32-
ln -s ".buildozer_$1" ${PROJECT_ROOT}/.buildozer
31+
mkdir -p "${PROJECT_ROOT}/.buildozer_$1_qt6"
32+
ln -s ".buildozer_$1_qt6" ${PROJECT_ROOT}/.buildozer
3333

3434
DOCKER_BUILD_FLAGS=""
3535
if [ ! -z "$ELECBUILD_NOCACHE" ] ; then
@@ -44,7 +44,7 @@ fi
4444
info "building docker image."
4545
docker build \
4646
$DOCKER_BUILD_FLAGS \
47-
-t electrum-android-builder-img \
47+
-t electrum-android-builder-img-qt6 \
4848
--file "$CONTRIB_ANDROID/Dockerfile" \
4949
"$PROJECT_ROOT"
5050

@@ -84,7 +84,7 @@ docker run -it --rm \
8484
-v "$PROJECT_ROOT_OR_FRESHCLONE_ROOT"/.buildozer/.gradle:/home/user/.gradle \
8585
$DOCKER_RUN_FLAGS \
8686
--workdir /home/user/wspace/electrum \
87-
electrum-android-builder-img \
87+
electrum-android-builder-img-qt6 \
8888
./contrib/android/make_apk.sh "$@"
8989

9090
# make sure resulting binary location is independent of fresh_clone

0 commit comments

Comments
 (0)