From ea1cf6d71b74513ad8c3c6608f61d262fd8dad7c Mon Sep 17 00:00:00 2001
From: Philip Scherer <phesch@phesch.de>
Date: Sun, 16 Jul 2023 10:53:07 +0200
Subject: [PATCH] Fix libsignal-client patch files for v0.26.0

---
 libsignal.patch | 22 +++++-----------------
 1 file changed, 5 insertions(+), 17 deletions(-)

diff --git a/libsignal.patch b/libsignal.patch
index 70c506b..f2de41c 100644
--- a/libsignal.patch
+++ b/libsignal.patch
@@ -22,20 +22,6 @@ index 0c8f9458..01d198e7 100644
  
      if (JavaVersion.current().isJava8Compatible()) {
          allprojects {
-@@ -37,13 +37,6 @@ task makeJniLibrariesDesktop(type:Exec) {
-   commandLine './build_jni.sh', 'desktop'
- }
- 
--task makeAll() {
--  group 'Rust'
--  description 'Build the native libraries'
--
--  dependsOn 'makeJniLibrariesDesktop', 'makeJniLibrariesAndroid'
--}
--
- task cargoClean(type:Exec) {
-   group 'Rust'
-   commandLine 'cargo', 'clean'
 diff --git a/java/client/build.gradle b/java/client/build.gradle
 index 7ee6b154..8fa89874 100644
 --- a/java/client/build.gradle
@@ -101,14 +87,16 @@ diff --git a/java/settings.gradle b/java/settings.gradle
 index f6414646..13575990 100644
 --- a/java/settings.gradle
 +++ b/java/settings.gradle
-@@ -6,13 +6,4 @@ pluginManagement {
+@@ -6,15 +6,4 @@ pluginManagement {
      }
  }
  
 -include ':client', ':server'
 -
--if (JavaVersion.current().isJava11Compatible()) {
--    include ':android'
+-if (hasProperty('skipAndroid')) {
+-    // Do nothing
+-} else if (JavaVersion.current().isJava11Compatible()) {
+-    include ':android', ':android:benchmarks'
 -} else if (gradle.startParameter.getTaskNames().any { name -> name.contains('android:') }) {
 -    throw new GradleException("building for Android requires JDK 11 or newer")
 -} else if (gradle.startParameter.getTaskNames().any { name -> name.lastIndexOf(':') <= 0 }) {