From e3b32295affd83a6f9cb8d90c9698ce55ce3e6a1 Mon Sep 17 00:00:00 2001
From: savoirfairelinux <mobile@savoirfairelinux.com>
Date: Fri, 26 Feb 2021 21:07:00 -0500
Subject: [PATCH 1/2] Updates Jami to 20210226-01

Signed-off-by: savoirfairelinux <mobile@savoirfairelinux.com>
---
 metadata/cx.ring.yml | 38 ++++++++++++++++++++++++++++++++++++--
 1 file changed, 36 insertions(+), 2 deletions(-)

diff --git a/metadata/cx.ring.yml b/metadata/cx.ring.yml
index 304f2ce1b4..31e6283550 100644
--- a/metadata/cx.ring.yml
+++ b/metadata/cx.ring.yml
@@ -1236,6 +1236,40 @@ Builds:
       - ./compile.sh --release --daemon
     ndk: r21d
 
+  - versionName: 20210226-01
+    versionCode: 286
+    commit: android/release_286
+    timeout: 10800
+    subdir: client-android/ring-android/app
+    submodules: true
+    sudo:
+      - apt-get update || apt-get update
+      - apt-get install -y -t testing swig
+      - apt-get install -y -t stretch-backports-sloppy libarchive13
+      - apt-get install -y -t stretch-backports cmake
+    gradle:
+      - noPush
+    rm:
+      - client-electron
+      - client-gnome
+      - client-ios
+      - client-macosx
+      - client-uwp
+      - client-qt
+      - plugins
+      - docker
+      - docs
+      - lrc
+      - packaging
+      - scripts
+    prebuild: $ANDROID_HOME/tools/bin/sdkmanager 'platforms;android-30' 'build-tools;30.0.2'
+    build:
+      - cd ../..
+      - export ANDROID_NDK_ROOT="$ANDROID_NDK"
+      - export ANDROID_ABI="armeabi-v7a arm64-v8a x86_64"
+      - ./compile.sh --release --daemon
+    ndk: r21d
+
 MaintainerNotes: |-
     Ring has a lot of native dependencies, the source tarballs of these are all downloaded and build for all enabled architectures.
     Build failed with swig 2.0.12 from jessie but works with 3.0.10 from jessie-backports.
@@ -1245,5 +1279,5 @@ MaintainerNotes: |-
 
 AutoUpdateMode: None
 UpdateCheckMode: None
-CurrentVersion: 20210222-01
-CurrentVersionCode: 285
+CurrentVersion: 20210226-01
+CurrentVersionCode: 286

From d0c0328c5de4ded4726edfb8ea45a020cf32d13e Mon Sep 17 00:00:00 2001
From: relan <email@hidden>
Date: Sun, 28 Feb 2021 14:16:01 +0300
Subject: [PATCH 2/2] Jami: fix build-tools version

---
 metadata/cx.ring.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/metadata/cx.ring.yml b/metadata/cx.ring.yml
index 31e6283550..91b72a7b9d 100644
--- a/metadata/cx.ring.yml
+++ b/metadata/cx.ring.yml
@@ -1262,7 +1262,7 @@ Builds:
       - lrc
       - packaging
       - scripts
-    prebuild: $ANDROID_HOME/tools/bin/sdkmanager 'platforms;android-30' 'build-tools;30.0.2'
+    prebuild: $ANDROID_HOME/tools/bin/sdkmanager 'platforms;android-30' 'build-tools;30.0.3'
     build:
       - cd ../..
       - export ANDROID_NDK_ROOT="$ANDROID_NDK"