From 4ed0ffb84676811f540b412260ad89bb80aa8eee Mon Sep 17 00:00:00 2001
From: Inex Code <inex.code@selfprivacy.org>
Date: Sat, 31 Dec 2022 10:56:47 +0300
Subject: [PATCH] ci: Enable AAB generation

---
 .drone.yml                | 40 +++++++++++++++++++--------------------
 android/gradle.properties |  1 +
 ci.py                     |  1 +
 3 files changed, 22 insertions(+), 20 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index 129e1070..76bf5dd7 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -97,16 +97,16 @@ steps:
       GOOGLE_KEYSTORE_PASS:
         from_secret: GOOGLE_KEYSTORE_PASS
 
-#  - name: Build Intermediate Android Release Artifact (Bundle)
-#    commands:
-#      - ./ci.py --build-bundle
-#    environment:
-#      STANDALONE_KEYSTORE_PASS:
-#        from_secret: STANDALONE_KEYSTORE_PASS
-#      FDROID_KEYSTORE_PASS:
-#        from_secret: FDROID_KEYSTORE_PASS
-#      GOOGLE_KEYSTORE_PASS:
-#        from_secret: GOOGLE_KEYSTORE_PASS
+  - name: Build Intermediate Android Release Artifact (Bundle)
+    commands:
+      - ./ci.py --build-bundle
+    environment:
+      STANDALONE_KEYSTORE_PASS:
+        from_secret: STANDALONE_KEYSTORE_PASS
+      FDROID_KEYSTORE_PASS:
+        from_secret: FDROID_KEYSTORE_PASS
+      GOOGLE_KEYSTORE_PASS:
+        from_secret: GOOGLE_KEYSTORE_PASS
 
   - name: Sign Android Release Artifact (.APK) for Standalone Use
     commands:
@@ -132,16 +132,16 @@ steps:
       GOOGLE_KEYSTORE_PASS:
         from_secret: GOOGLE_KEYSTORE_PASS
 
-#  - name: Sign Android Release Artifact (Bundle) for Google Play
-#    commands:
-#      - ./ci.py --sign-bundle
-#    environment:
-#      STANDALONE_KEYSTORE_PASS:
-#        from_secret: STANDALONE_KEYSTORE_PASS
-#      FDROID_KEYSTORE_PASS:
-#        from_secret: FDROID_KEYSTORE_PASS
-#      GOOGLE_KEYSTORE_PASS:
-#        from_secret: GOOGLE_KEYSTORE_PASS
+  - name: Sign Android Release Artifact (Bundle) for Google Play
+    commands:
+      - ./ci.py --sign-bundle
+    environment:
+      STANDALONE_KEYSTORE_PASS:
+        from_secret: STANDALONE_KEYSTORE_PASS
+      FDROID_KEYSTORE_PASS:
+        from_secret: FDROID_KEYSTORE_PASS
+      GOOGLE_KEYSTORE_PASS:
+        from_secret: GOOGLE_KEYSTORE_PASS
 
   - name: Package Linux AppImage Artifact
     commands:
diff --git a/android/gradle.properties b/android/gradle.properties
index 94adc3a3..c396be2a 100644
--- a/android/gradle.properties
+++ b/android/gradle.properties
@@ -1,3 +1,4 @@
 org.gradle.jvmargs=-Xmx1536M
 android.useAndroidX=true
 android.enableJetifier=true
+android.bundle.enableUncompressedNativeLibs=false
diff --git a/ci.py b/ci.py
index 02a17004..b0b9e996 100755
--- a/ci.py
+++ b/ci.py
@@ -149,6 +149,7 @@ def package_linux_archive():
 def deploy_gitea_release():
   gitea_upload_attachment(f"{HOST_MOUNTED_VOLUME}/standalone_{APP_NAME}-{APP_SEMVER}.apk")
   gitea_upload_attachment(f"{HOST_MOUNTED_VOLUME}/standalone_{APP_NAME}-{APP_SEMVER}.apk.idsig")
+  gitea_upload_attachment(f"{HOST_MOUNTED_VOLUME}/{APP_NAME}-{APP_SEMVER}.aab")
   gitea_upload_attachment(f"{HOST_MOUNTED_VOLUME}/SelfPrivacy-{APP_SEMVER}-x86_64.AppImage")
   gitea_upload_attachment(f"{HOST_MOUNTED_VOLUME}/SelfPrivacy-{APP_SEMVER}-x86_64.AppImage.zsync")
   gitea_upload_attachment(f"{HOST_MOUNTED_VOLUME}/{APP_NAME}-{APP_SEMVER}.flatpak")