Skip to content

Commit 361264b

Browse files
committed
* Synchronization over (Next/Own)cloud
Synchronize now added * Signing apk before deploying * Use the version from the crates.io
1 parent 8511386 commit 361264b

File tree

4 files changed

+16
-14
lines changed

4 files changed

+16
-14
lines changed

.gitignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,3 @@
33
/buildallandrun.sh
44
/android-toolchain/
55
/tools/
6-
/ks/

.travis.yml

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,19 +22,20 @@ before_install:
2222
script:
2323
- mvn -f java/pom.xml clean install
2424
before_deploy:
25-
- jarsigner -verbose -sigalg SHA1withRSA -digestalg SHA1 -keystore ks/rkl.jks -storepass $storepass -keypass $keypass java/target/rust-keylock-android-0.4.0.apk rustkeylock
26-
- mv rust-keylock-android-0.4.0.apk rust-keylock-android-0.4.0.apk.tmp
27-
- "${ANDROID_HOME}/build-tools/24.0.2/zipalign -v 4 rust-keylock-android-0.4.0.apk.tmp rust-keylock-android-0.4.0.apk"
25+
- jarsigner -verbose -sigalg SHA1withRSA -digestalg SHA1 -keystore ks/rkl.jks -storepass
26+
$storepass -keypass $keypass java/target/rust-keylock-android-0.4.0-unsigned.apk rustkeylock
27+
- "${ANDROID_HOME}/build-tools/26.0.2/zipalign -v 4 java/target/rust-keylock-android-0.4.0-unsigned.apk
28+
java/target/rust-keylock-android.apk"
2829
deploy:
2930
provider: releases
3031
api_key:
3132
secure: QAFSbUoyNv/1/lkSzS4SBXwozKkk3Hnjlio6aH6akEniFBhkG93+8SUHLFl/O7MR74IpCG4iIm+E7Lo8sZR/xkk5SJgvw2ts4se06b5QmSy0AFjdWuaPJvJpF3WCnOmNiOa/MNBQdnQGoBHDtkmiZM/k4TX4sZfOKN5JEzItt9rSF23koAdnGvwwiaihjIcA1kOLFcGYmzNQF3qwBsnwwhsTHINGwvXcpbLWF6/3pYWXcnPDL/h2Vb+iTg+fG4KBHLK3l7jXarJmqy2uOHs6Nabz1e0KDEoWrUH1GXKzPBfxyXpTXhwIek7iI95QF/eiFgsHlYuX0fAwSRqs5zVEwmx+vmoi5GwaTId1DeY82yn6jl+a5fPFRFVz6DRBQwIu6GgQnMHuijnDrNGim4jrYmDaKHSA+9eK9luXZsXFCxHwTAHRdeWWebK0CdHDr+r3BP9kCzHxmOopwvxt/x3/AZwEAPlNPfLKVFdnKSx7J71lUkiJIjxDOnijWBhmFeOgb7VlHc2Fhg9EZ+/+DD0g+o6IfVqvdBSInD39ynnU8KJVJDWyykyjK45hmZDRCNdN3ns2pSTU7KPS5orTtAOMKs0VPh66/S9aP2TO0W2IUtaY3oyg83g8hCr+BIamyLhA1QQDdlHd7wgy2sNdmt+vVi/KEHGxSw2f/3U3y2XmQMY=
32-
file: java/target/rust-keylock-android-0.3.0.apk
33+
file: java/target/rust-keylock-android.apk
3334
skip_cleanup: true
3435
on:
3536
repo: rust-keylock/rust-keylock-android
3637
tags: true
3738
env:
3839
global:
39-
- secure: FbNZegeBAEOx1xolpsTBZX8M4CyTRCYaVXEkMdwFjQCirjpn8S8CdLhqzzvp/NBHVAHu+UwAGCCWkwmVwdVDNxPWOfsm8E5JCq0vku7k1wTGDNtliVs5aVgSv6IyhbSaUY5Sa+l6Dyko/Al0UsLnKMTADkY6hGwNRfD6myrOr7ByfZCvy+K99wEyhBRuoT1RwLat2UlbzTxXDrjzPt1kE0J/Lrmqkc57zODxGo5RQto9cIELU2tX1FTZlOw0Ai7jq/i+5Ms/vVQMKaPWS5cMjDhBBYuwMJrd6TzYcHqvMbE5XOzZRLxmKuvvI+SEGcnDa7V0t3xI3KkDb2/JrMX5Pp+3bTi+r9vjUmOsLaJJ7mPBj/XxHaACFJvxXRttq1mX2PMt90c6ZS0B+Cnu4vutmHKwGfJhiXjbQLdZGjXGYvg6MEBQvDGjPUzx3oCVjzT1WPUyYx3AzeSBFoBcI9dFvyB9uPlIoxaZVQA9vr46m8RT8lMAhCICQ4RiV9WVugbOopVIjV4s0Hguj/vnjHk+EUQ/jZ/WqZVdrFfHAafZOGBJ2CdRLCbA89VEkaLIWVh+O1ag2yPvSeNGsK74ciOe97+sEneIz5Gwbm0ZvsCUh3DOCHFRAEBZsNn7Uhuw2/GwntpUYqZywBEKoCOjrJ4zO+7nfTL2+IZRq+77xAuh3aE=
40-
- secure: wFTs0tRC44hdVzHdSGHAhjTIfV31uDBrfJqeu1ZyjLeuiKV626ru1OKaSj5g7wCdh0637slf6AFpJgwwu8PfyxGxI1U5w6ocY4/l7kMuu/Ed4GeAKNKMs/5MLwZ4M+u+GVTqffuaHnPLqMASFTrfI4ojeYzib15OvU+nS3L64MzB/vRzDQvRBQI0Dd9vcu2qHI1I8AnfYv7Ecpnxq2FUNYvWTtdWybfR8oG2fl/dFWU+TYqOP+NCABjJh49F+0XcJRY8fs5kJBhoq06OABujHtS3qgqREPjqhqbChZJHZWy1S1MUVXPNq45BuIXVrK04+izhjtmrgohrPpx9b6jI7Vq3G16HWJMKkxrS9XnNA+7lQMGBXkbYoZzJdSlSHYIvCg0DeQ/FW3Sht4VuKbdIllS0f4J1M/H0va8NfYRYxFlxj4T3on626yIJXiPPBfqt3dPM5ESUeBHApAxm38LcLSMMSufytBvjLDnWFyuVBn3NChGpBQ0hSk7BH0XM5QPq59f82u1y0C/mCyHyBylhhGvbIW+BSwRKUBcFPLLYC9Qpjo85wzqpmnfJyfAQ8uaLyiq0o/2PYdY08WQAHPUjjHr+ZJJl3atZ0EHkbX7OYQptHoK8YzAY9nnOLHwDitj900aWcENYmtKsaLF7HShu3yI7mQq7RUi5yXgmDF4XrFw=
40+
- secure: CsqkZWx2fDhbPwAAMiHyGTSX+XdvJdLY8ngktSMfA2HxVk4A1BLO0lwT/25d7Rw8wxmle/+t43cNmyZJ+TdR/J4AbAtKNTlBUo0EFi6PQKDEQJK+Tn+TnelMZLgMa3DlrBhAgN+keZHZM3PBE76fwfuR1x7QGbwP3KAryJsmpESJfwHmn2UpwAX3TmE6RW/MqoSSlEyhiJEEyUuWjjM40bKUhsyLbJPgdyhPRnUrs13j2k/Luhf8UAaWxdQp48dOkYdUxb4VAY7pQdEaV362xlK48RdF/2X33YX+vJ8GwnwMljchOWq91tE2F1HKrSEHzA3EtEsc7ZZgGoS5wAC5oB8SOPhA2HgczQbEMon3YSvGt2nv50q6gwvgPNvbEUuR1UV3tFgqoUyVfpPGpj/Zmz2dmHA6NF2BCrtgMk/R9G2NS/u9a83SVJd/JH4XP7m2ca3WxiS9p/PlvvQEQNmCymWY3zYcgPtZrsRF3awbvcXks9UnBMOrv5qp5sfv4NeQbXPlB+R1T8SiEOnVyIxdKigSgK+oNSvECK3VjDuxLtrU8kyJfSXdvUE9I8DtHvwgYEZW4v73N6PpEda6tz/FZJskrRavGBuPb+PaRBYzY74+GRqugQIg3hgt6F0DCaPKSbnls526aPr0l/vWpYqy6laPvxDOC4tfu6tggD/cULI=
41+
- secure: vDa4L/DxCKcnzn16tI45Cuj1AsfGlBGkAmf2tidfTubcxgwXSY1jTZcK3I1Dq8qdeASpXlGQ3t+iocEIW0pPSuB28on5ZSBuB2o3b1k6BgwAx9WQrqdvCQ/oR5kURxb3Qei1Runp5g5VvPmRqwOrSwR2UKrZ/j+q3b7uQIrWSzoGSXlqXi5eAPCfGfBiiMEIDtDffcvJIyz8GuwL0qdXOlOTxj/uIZHsZRqrm8DR5sdQrLl3TU0lYcXA1jQPFBcB/cJT8dw1jpfH08b8+K4mvVVYp7Mh6whRFjMsuJrHUrjnGpwhOa49tIxufZ/k8pAVaMY3O1z++8jQhHkWEMzy7Ekwif8kDfy3AZVHrNcJr6GH4eQuPiJClkv3tC+mzV/8XW4KT0cyJjMc1Nx+VHq/+ujnZ95Z041+hPxUsQMwtC5j8NzDnoNxzo6UAMzDeVsEMVx9HybLWChM0RC9c1Az21MwTfqc8daNC8t6rYPZG3sTJDTx3H/bYqsdJmrxCVmkAe+hkGOc6IPvlIjmnYUHiYpz5DYEmYS1g0Zeak8QWzLEd1Cem9xIufojNe85B3I03XCnFF4RFIhwzY0kY3FctKq+8klnlTU8Lm74XyH1kxbVvUCcUTK1ORvBIfXOtR1Cg/Ik8o71HcgadPJnR/m5MtJkB0CR4utrvdhetwNWt5s=

ks/.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
/rkl.jks

rust-build/pre_build_rust_keylock_android.sh

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -47,11 +47,14 @@ fi
4747

4848
ANDROID_NDK_HOME=${ANDROID_NDK}
4949

50-
sh $ANDROID_NDK/build/tools/make-standalone-toolchain.sh --platform=android-16 --arch=arm --install-dir=android-toolchain
50+
echo Installing the Android toolchain
51+
52+
sh $ANDROID_NDK/build/tools/make-standalone-toolchain.sh --platform=android-16 --arch=arm --install-dir=android-toolchain > /dev/null
5153

5254
cd android-toolchain
5355
ANDROID_TOOLCHAIN_DIR=`pwd`
54-
echo Android toolchain set in $ANDROID_TOOLCHAIN_DIR
56+
57+
echo Android toolchain installed in $ANDROID_TOOLCHAIN_DIR
5558

5659
# Install the jar containing the jna native library for Android (taken from https://github.com/java-native-access/jna/tree/master/lib/native)
5760
echo "Installing jar android-arm.jar in the local Maven... This jar is not provided in the Maven Central, rather by the project's GitHub repo."
@@ -87,10 +90,8 @@ cd $OPENSSL_SRC_DIR
8790

8891
echo Building openssl
8992

90-
{
91-
./config shared no-ssl2 no-ssl3 no-comp no-hw no-engine --openssldir=$OPENSSL_SRC_DIR/build --prefix=$OPENSSL_SRC_DIR/build
92-
make all
93-
make install CC=$ANDROID_TOOLCHAIN/arm-linux-androideabi-gcc RANLIB=$ANDROID_TOOLCHAIN/arm-linux-androideabi-ranlib
94-
} &> /dev/null
93+
./config shared no-ssl2 no-ssl3 no-comp no-hw no-engine --openssldir=$OPENSSL_SRC_DIR/build --prefix=$OPENSSL_SRC_DIR/build
94+
make all > /dev/null
95+
make install CC=$ANDROID_TOOLCHAIN/arm-linux-androideabi-gcc RANLIB=$ANDROID_TOOLCHAIN/arm-linux-androideabi-ranlib > /dev/null
9596

9697
echo openssl build success

0 commit comments

Comments
 (0)