From d68879d79faa703b30aa8a30ce53962b6ca42466 Mon Sep 17 00:00:00 2001
From: linsui <2873532-linsui@users.noreply.gitlab.com>
Date: Tue, 28 Dec 2021 15:09:03 +0000
Subject: [PATCH] atalk: fix 2.8.0

---
 metadata/org.atalk.android.yml | 41 +++++++---------------------------
 1 file changed, 8 insertions(+), 33 deletions(-)

diff --git a/metadata/org.atalk.android.yml b/metadata/org.atalk.android.yml
index 26b6f5335d..1e784165f0 100644
--- a/metadata/org.atalk.android.yml
+++ b/metadata/org.atalk.android.yml
@@ -1543,40 +1543,14 @@ Builds:
       - ./build-jnilibs4atalk.sh
     ndk: r20
 
-  - versionName: 2.7.1
-    versionCode: 207010
-    disable: https://github.com/cmeng-git/atalk-android/issues/185
-    commit: 37ee226661399eca1c67298e39b2b595f674a8c7
-    subdir: aTalk
-    gradle:
-      - fdroid
-    rm:
-      - aTalk/lib/src_reference/
-      - aTalk/jni/ffmpeg/android/
-      - aTalk/jni/openssl/android/
-      - aTalk/jni/vpx/android/
-    prebuild:
-      - $$SDK$$/tools/bin/sdkmanager 'ndk;18.1.5063045' > /dev/null
-      - sed -i -e 's|dl.bintray.com/google/exoplayer/|jitpack.io|' build.gradle
-      - cd jni/static_library_built
-      - sed -i -e '/export ANDROID_NDK_HOME/d' openssl/_settings.sh
-      - sed -i -e 's|android/android-ndk-r18b|android-sdk/ndk/18.1.5063045|' ffmpeg-x264/_settings.sh
-        libvpx/_settings.sh
-    scanignore:
-      - aTalk/build.gradle
-    scandelete:
-      - aTalk/jni/static_library_built
-      - aTalk/third_party/m2
-    build:
-      - cd jni/static_library_built
-      - ./build-jnilibs4atalk.sh
-    ndk: r20
-
   - versionName: 2.8.0
     versionCode: 208000
-    disable: https://github.com/cmeng-git/atalk-android/issues/185
     commit: cd3069568236ab593f4001a9c2b4649b7504eace
     subdir: aTalk
+    sudo:
+      - apt-get update || apt-get update
+      - apt-get install openjdk-11-jdk-headless
+      - update-alternatives --auto java
     gradle:
       - fdroid
     rm:
@@ -1585,14 +1559,15 @@ Builds:
       - aTalk/jni/openssl/android/
       - aTalk/jni/vpx/android/
     prebuild:
-      - $$SDK$$/tools/bin/sdkmanager 'ndk;18.1.5063045' > /dev/null
+      - JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64 $$SDK$$/tools/bin/sdkmanager 'ndk;18.1.5063045'
+        'build-tools;31.0.0' 'build-tools;30.0.3' 'platforms;android-31' > /dev/null
+      - cp $$SDK$$/build-tools/30.0.3/lib/dx.jar $$SDK$$/build-tools/31.0.0/lib/dx.jar
+      - cp $$SDK$$/build-tools/30.0.3/dx $$SDK$$/build-tools/31.0.0/dx
       - sed -i -e 's|dl.bintray.com/google/exoplayer/|jitpack.io|' build.gradle
       - cd jni/static_library_built
       - sed -i -e '/export ANDROID_NDK_HOME/d' openssl/_settings.sh
       - sed -i -e 's|android/android-ndk-r18b|android-sdk/ndk/18.1.5063045|' ffmpeg-x264/_settings.sh
         libvpx/_settings.sh
-      - $$SDK$$/tools/bin/sdkmanager 'build-tools;31.0.0' 'build-tools;30.0.3' > /dev/null
-      - cp $$SDK$$/build-tools/30.0.3/lib/dx.jar $$SDK$$/build-tools/31.0.0/lib/dx.jar
     scanignore:
       - aTalk/build.gradle
     scandelete: