diff --git a/.travis.yml b/.travis.yml index 5907a4632..dc2016f8b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -78,8 +78,8 @@ jobs: - sudo docker run -it -u 1000:1000 --rm --name electrum-android-builder-cont --env CI=true -v $PWD:/home/user/wspace/electrum --workdir /home/user/wspace/electrum electrum-android-builder-img ./contrib/android/make_apk # kill background sleep loop - kill %1 - - ls -la bin - - if [ $(ls bin | grep -c Electrum-*) -eq 0 ]; then exit 1; fi + - ls -la dist + - if [ $(ls dist | grep -c Electrum-*) -eq 0 ]; then exit 1; fi after_success: true # disabled for now as travis started to always time out: - if: false AND ((branch = master) OR (tag IS present)) diff --git a/contrib/android/Readme.md b/contrib/android/Readme.md index 5281cfbf8..8db6102ca 100644 --- a/contrib/android/Readme.md +++ b/contrib/android/Readme.md @@ -63,7 +63,7 @@ folder. and so the modifications will affect it, e.g. `.buildozer` folder will be created. -5. The generated binary is in `./bin`. +5. The generated binary is in `./dist`. ## Verifying reproducibility and comparing against official binary @@ -95,7 +95,7 @@ You probably need to clear the cache: `rm -rf .buildozer/android/platform/build- ### How do I deploy on connected phone for quick testing? Assuming `adb` is installed: ``` -$ adb -d install -r bin/Electrum-*-arm64-v8a-debug.apk +$ adb -d install -r dist/Electrum-*-arm64-v8a-debug.apk $ adb shell monkey -p org.electrum.electrum 1 ``` @@ -154,7 +154,7 @@ $ run-as org.electrum.electrum cp /data/data/org.electrum.electrum/files/data/wa ### How to investigate diff between binaries if reproducibility fails? ``` -cd bin/ +cd dist/ unzip Electrum-*.apk1 -d apk1 mkdir apk1/assets/private_mp3/ tar -xzvf apk1/assets/private.mp3 --directory apk1/assets/private_mp3/ diff --git a/contrib/android/buildozer.spec b/contrib/android/buildozer.spec index 43d505352..aadb5c5b5 100644 --- a/contrib/android/buildozer.spec +++ b/contrib/android/buildozer.spec @@ -206,6 +206,9 @@ p4a.local_recipes = %(source.dir)s/contrib/android/p4a_recipes/ # (int) Log level (0 = error only, 1 = info, 2 = debug (with command output)) log_level = 1 +# (str) Path to build output (i.e. .apk, .ipa) storage +bin_dir = ./dist + # ----------------------------------------------------------------------------- # List as sections diff --git a/contrib/android/make_apk b/contrib/android/make_apk index 655d9da42..3248c3769 100755 --- a/contrib/android/make_apk +++ b/contrib/android/make_apk @@ -82,5 +82,5 @@ popd info "done." -ls -la "$PROJECT_ROOT/bin" -sha256sum "$PROJECT_ROOT/bin"/* +ls -la "$PROJECT_ROOT/dist" +sha256sum "$PROJECT_ROOT/dist"/* diff --git a/contrib/release.sh b/contrib/release.sh index fe8d898e1..5b6dba1b8 100755 --- a/contrib/release.sh +++ b/contrib/release.sh @@ -132,8 +132,8 @@ else ./contrib/android/make_apk release popd - cp contrib/android/fresh_clone/electrum/bin/$target1 dist/ - cp contrib/android/fresh_clone/electrum/bin/$target2 dist/ + cp contrib/android/fresh_clone/electrum/dist/$target1 dist/ + cp contrib/android/fresh_clone/electrum/dist/$target2 dist/ fi