Skip to content

Commit

Permalink
qt6: use different build image name, different buildozer work dir
Browse files Browse the repository at this point in the history
  • Loading branch information
accumulator committed Oct 26, 2023
1 parent a983c92 commit 49a61a8
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions contrib/android/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ fi

# create symlink
rm -f ${PROJECT_ROOT}/.buildozer
mkdir -p "${PROJECT_ROOT}/.buildozer_$1"
ln -s ".buildozer_$1" ${PROJECT_ROOT}/.buildozer
mkdir -p "${PROJECT_ROOT}/.buildozer_$1_qt6"
ln -s ".buildozer_$1_qt6" ${PROJECT_ROOT}/.buildozer

DOCKER_BUILD_FLAGS=""
if [ ! -z "$ELECBUILD_NOCACHE" ] ; then
Expand All @@ -44,7 +44,7 @@ fi
info "building docker image."
docker build \
$DOCKER_BUILD_FLAGS \
-t electrum-android-builder-img \
-t electrum-android-builder-img-qt6 \
--file "$CONTRIB_ANDROID/Dockerfile" \
"$PROJECT_ROOT"

Expand Down Expand Up @@ -84,7 +84,7 @@ docker run -it --rm \
-v "$PROJECT_ROOT_OR_FRESHCLONE_ROOT"/.buildozer/.gradle:/home/user/.gradle \
$DOCKER_RUN_FLAGS \
--workdir /home/user/wspace/electrum \
electrum-android-builder-img \
electrum-android-builder-img-qt6 \
./contrib/android/make_apk.sh "$@"

# make sure resulting binary location is independent of fresh_clone
Expand Down

0 comments on commit 49a61a8

Please sign in to comment.