From cd2a1ed999208142d906ae7f6881e8e1fc045c40 Mon Sep 17 00:00:00 2001
From: Vitalii Koshura <lestat.de.lionkur@gmail.com>
Date: Thu, 25 Feb 2021 06:28:20 +0000
Subject: [PATCH] BOINC: fix 7.16.16 (71616)

Signed-off-by: Vitalii Koshura <lestat.de.lionkur@gmail.com>
---
 metadata/edu.berkeley.boinc.yml               | 33 +++++++++----------
 metadata/edu.berkeley.boinc/fix-version.patch | 15 ---------
 .../edu.berkeley.boinc/remove-xiaomi.patch    | 17 ----------
 3 files changed, 16 insertions(+), 49 deletions(-)
 delete mode 100644 metadata/edu.berkeley.boinc/fix-version.patch
 delete mode 100644 metadata/edu.berkeley.boinc/remove-xiaomi.patch

diff --git a/metadata/edu.berkeley.boinc.yml b/metadata/edu.berkeley.boinc.yml
index 47d894c990..68fb6cb70e 100644
--- a/metadata/edu.berkeley.boinc.yml
+++ b/metadata/edu.berkeley.boinc.yml
@@ -28,30 +28,29 @@ Builds:
   - versionName: 7.16.16
     versionCode: 71616
     commit: client_release/7.16/7.16.16
-    subdir: android/BOINC/
-    patch:
-      - fix-version.patch
-      - remove-xiaomi.patch
+    subdir: android/BOINC/app
     gradle:
       - yes
-    output: app/build/outputs/apk/release/app-release-unsigned.apk
+    rm:
+      - clientgui/res/*.zip
+      - clientscr/*.zip
+      - clientscr/progress/simt
+      - clientscr/progress/win/
+      - samples/example_app/bin/
     prebuild:
-      - cd ..
+      - sed -i -e 's/versionCode .*/versionCode $$VERCODE$$/' build.gradle
+      - sed -i -e 's/versionName .*/versionName "$$VERSION$$"/' build.gradle
+      - sed -i -e '/xiaomi_.* {/,/}/d' build.gradle
+      - sed -i -e '/NDK_ROOT/d' ../../buildAndroidBOINC-CI.sh
+    build:
+      - cd ../..
+      - export CREATED_NDK_FOLDER=yes
+      - export NDK_ROOT=$$NDK$$
       - ./buildAndroidBOINC-CI.sh --silent --ci --arch arm
       - ./buildAndroidBOINC-CI.sh --silent --ci --arch arm64
       - ./buildAndroidBOINC-CI.sh --silent --ci --arch x86
       - ./buildAndroidBOINC-CI.sh --silent --ci --arch x86_64
-      - cd BOINC
-    scanignore:
-      - 3rdParty
-      - android
-      - lib
-      - api
-      - client
-      - stage
-      - samples
-      - clientscr
-      - clientgui/res
+    ndk: r21d
 
 AutoUpdateMode: None
 UpdateCheckMode: Static
diff --git a/metadata/edu.berkeley.boinc/fix-version.patch b/metadata/edu.berkeley.boinc/fix-version.patch
deleted file mode 100644
index 69ac4b6659..0000000000
--- a/metadata/edu.berkeley.boinc/fix-version.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/android/BOINC/app/build.gradle b/android/BOINC/app/build.gradle
-index 9325404a2a..b832587738 100644
---- a/android/BOINC/app/build.gradle
-+++ b/android/BOINC/app/build.gradle
-@@ -73,8 +73,8 @@ android {
-         applicationId "edu.berkeley.boinc"
-         minSdkVersion 16
-         targetSdkVersion 28
--        versionCode buildVersionCode().toInteger()
--        versionName buildVersionName()
-+        versionCode 71616
-+        versionName "7.16.16"
- 
-         // Required when setting minSdkVersion to 20 or lower
-         multiDexEnabled true
diff --git a/metadata/edu.berkeley.boinc/remove-xiaomi.patch b/metadata/edu.berkeley.boinc/remove-xiaomi.patch
deleted file mode 100644
index f987cf3b32..0000000000
--- a/metadata/edu.berkeley.boinc/remove-xiaomi.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff --git a/android/BOINC/app/build.gradle b/android/BOINC/app/build.gradle
-index 9325404a2a..032a702d94 100644
---- a/android/BOINC/app/build.gradle
-+++ b/android/BOINC/app/build.gradle
-@@ -94,12 +94,6 @@ android {
-             testCoverageEnabled true
-             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules-debug.txt'
-         }
--        xiaomi_release {
--            initWith release
--        }
--        xiaomi_debug {
--            initWith debug
--        }
-     }
-     compileOptions {
-         sourceCompatibility '1.8'