Add protobuf to makedepends and build rust lib before calling gradle

2 files changed, 4 insertions, 2 deletions

diff --git a/.SRCINFO b/.SRCINFO
index a6092703eec7..379c27f36aed 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -13,6 +13,7 @@ pkgbase = libsignal-client
 	makedepends = gradle
 	makedepends = git
 	makedepends = zip
+	makedepends = protobuf
 	source = libsignal-client-java-0.2.0.tar.gz::https://github.com/signalapp/libsignal-client/archive/java-0.2.0.tar.gz
 	sha512sums = 258e3ca34cd0ab25ef8ac63c067ddfd1f795790a3fa34f27d13e1e31ad05dbc016b49579e050ec56e91f7ef0e73e12c42e41c81f809a3355532afe023ba556ec
 
diff --git a/PKGBUILD b/PKGBUILD
index 781979770a54..d0df67656416 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,7 +7,7 @@ _pkgver="java-${pkgver}"
 pkgrel=1
 pkgdesc='Library for the Signal Protocol.'
 url="https://github.com/signalapp/${pkgname}"
-makedepends=('cargo' 'gradle' 'git' 'zip')
+makedepends=('cargo' 'gradle' 'git' 'zip' 'protobuf')
 arch=('i686' 'x86_64' 'armv6h' 'armv7h' 'aarch64')
 license=('GPL3')
 source=("${pkgname}-${_pkgver}.tar.gz::https://github.com/signalapp/${pkgname}/archive/$_pkgver.tar.gz")
@@ -28,7 +28,8 @@ prepare() {
 build() {
   cd "${pkgname}-${_pkgver}/java"
 
-  gradle assemble
+  ./build_jni.sh desktop
+  gradle --no-daemon assemble
 
   zip -d "java/build/libs/signal-client-java-${pkgver}.jar" "${_libname}.so"
 }