From 3b4391759af74144311d7d0118e20419c3284baa Mon Sep 17 00:00:00 2001
From: EndrII <EndrIIMail@gmail.com>
Date: Sun, 11 Apr 2021 10:09:18 +0300
Subject: [PATCH 1/4] use android single build

---
 BuildBotLib/cmake.py | 25 ++++++++++++++++++++++++-
 BuildBotLib/docs.py  |  8 ++++----
 2 files changed, 28 insertions(+), 5 deletions(-)

diff --git a/BuildBotLib/cmake.py b/BuildBotLib/cmake.py
index a976461..914abdf 100644
--- a/BuildBotLib/cmake.py
+++ b/BuildBotLib/cmake.py
@@ -54,7 +54,7 @@ class CMake(Make):
 
         return ' '.join(options)
 
-    def androidXmakeCmd(self, props):
+    def androidXmakeMultiAbiCmd(self, props):
         file = self.home + "/buildBotSecret/secret.json"
         secret = SecretManager(file, props)
         toochainFile = 'build/cmake/android.toolchain.cmake'
@@ -76,6 +76,29 @@ class CMake(Make):
 
         return ' '.join(options)
 
+    def androidXmakeSinglAbiCmd(self, props):
+        file = self.home + "/buildBotSecret/secret.json"
+        secret = SecretManager(file, props)
+        toochainFile = 'build/cmake/android.toolchain.cmake'
+
+        options = [
+            'cmake -GNinja',
+            '-DCMAKE_PREFIX_PATH=$QTDIR',
+            '-DQT_QMAKE_EXECUTABLE=$QTDIR/bin/qmake',
+            '-DANDROID_ABI=$ANDROID_ABI',
+            '-DCMAKE_FIND_ROOT_PATH=$QTDIR',
+            '-DCMAKE_TOOLCHAIN_FILE=$ANDROID_NDK_ROOT/' + toochainFile,
+            '-DSIGN_PATH="' + secret.getValue('SIGPATH') + '"',
+            '-DSIGN_ALIES="quasarapp"',
+            '-DSIGN_STORE_PASSWORD="' + secret.getValue('SIGPASS') + '"',
+            '-B cmake_build'
+        ]
+
+        return ' '.join(options)
+
+    def androidXmakeCmd(self, props):
+        return self.androidXmakeSinglAbiCmd(props)
+
     def wasmXmakeCmd(self, props):
         options = [
             'cmake -DCMAKE_PREFIX_PATH=$QTDIR',
diff --git a/BuildBotLib/docs.py b/BuildBotLib/docs.py
index dcb8a4a..3e51ea0 100644
--- a/BuildBotLib/docs.py
+++ b/BuildBotLib/docs.py
@@ -1,7 +1,7 @@
 # This Python file uses the following encoding: utf-8
 
 from BuildBotLib.cmake import CMake
-from buildbot.plugins import util, steps
+from buildbot.plugins import util
 
 
 class Docs(CMake):
@@ -34,9 +34,9 @@ class Docs(CMake):
             return 'mv docs ' + str(props.getProperty('copyFolder'))
 
         res += [self.generateStep(move,
-                                platform,
-                                'moveDocs',
-                                self.isDeploy)]
+                                  platform,
+                                  'moveDocs',
+                                  self.isDeploy)]
 
         return res
 

From 1e11215200b4e7fa90b177201cca0286af208913 Mon Sep 17 00:00:00 2001
From: EndrII <EndrIIMail@gmail.com>
Date: Sun, 11 Apr 2021 10:28:27 +0300
Subject: [PATCH 2/4] move workers

---
 BuildBotLib/buildBotWorkers.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/BuildBotLib/buildBotWorkers.py b/BuildBotLib/buildBotWorkers.py
index 4b06b4b..d7ae9ac 100644
--- a/BuildBotLib/buildBotWorkers.py
+++ b/BuildBotLib/buildBotWorkers.py
@@ -21,10 +21,10 @@ class BuildBotWorkers(BuildBotModule):
         password = scr.getValue('WorkerPass')
 
         self.masterConf['workers'] = [
-            worker.Worker("AndroidBuilder", password),
             worker.Worker("LinuxBuilder", password),
             worker.Worker("WindowsBuilder", password),
-            worker.Worker("AndroidCMakeBuilder", password),
+            worker.Worker("AndroidBuilder_v7", password),
+            worker.Worker("AndroidBuilder_v8", password),
             worker.Worker("LinuxCMakeBuilder", password),
             worker.Worker("WindowsCMakeBuilder", password),
             worker.Worker("RepoGen", password),

From fe63fd05eb639a5a0c553bbba931659a3a406d6d Mon Sep 17 00:00:00 2001
From: EndrII <EndrIIMail@gmail.com>
Date: Sun, 11 Apr 2021 10:29:56 +0300
Subject: [PATCH 3/4] added new workers

---
 master.cfg | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/master.cfg b/master.cfg
index d69e4ea..9f8c7c7 100644
--- a/master.cfg
+++ b/master.cfg
@@ -35,11 +35,12 @@ repoGen = QIFRepogen()
 
 bot.addBuilder("LinuxBuilder", qmakeLinux)
 bot.addBuilder("WindowsBuilder", qmakeWindows)
-bot.addBuilder("AndroidBuilder", qmakeAndroid)
 
 bot.addBuilder("LinuxCMakeBuilder", cmakeLinux)
 bot.addBuilder("WindowsCMakeBuilder", cmakeWindows)
-bot.addBuilder("AndroidCMakeBuilder", cmakeAndroid)
+
+bot.addBuilder("AndroidBuilder_v7", cmakeAndroid)
+bot.addBuilder("AndroidBuilder_v8", cmakeAndroid)
 
 bot.addBuilder("RepoGen", repoGen)
 

From c3c97c0e0d91890635628a7adc96635d22189e6f Mon Sep 17 00:00:00 2001
From: EndrII <EndrIIMail@gmail.com>
Date: Sun, 11 Apr 2021 10:31:11 +0300
Subject: [PATCH 4/4] fix workers sheduler

---
 BuildBotLib/buildBotShedulers.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/BuildBotLib/buildBotShedulers.py b/BuildBotLib/buildBotShedulers.py
index 8de6f38..e564212 100644
--- a/BuildBotLib/buildBotShedulers.py
+++ b/BuildBotLib/buildBotShedulers.py
@@ -25,10 +25,10 @@ class BuildBotShedulers(BuildBotModule):
     def initScheduler(self):
 
         buildersCode = ['LinuxBuilder',
-                        'AndroidBuilder',
+                        'AndroidBuilder_v7',
+                        'AndroidBuilder_v8',
                         'WindowsBuilder',
                         'LinuxCMakeBuilder',
-                        'AndroidCMakeBuilder',
                         'WindowsCMakeBuilder',
                         'Wasm32Builder',
                         ]