From 2f76393fd65ce64ec9bd43ca2de36516e4202cab Mon Sep 17 00:00:00 2001 From: Armand <4831c0@proton.me> Date: Thu, 21 Aug 2025 09:35:43 +0200 Subject: [PATCH] android: but transform aab & apk behind a flag for now --- firka/android/app/build.gradle.kts | 15 ++++++++++++--- firka/lib/helpers/firka_bundle.dart | 3 ++- tools/linux/build_apk.sh | 2 +- 3 files changed, 15 insertions(+), 5 deletions(-) diff --git a/firka/android/app/build.gradle.kts b/firka/android/app/build.gradle.kts index 0d6133a3..a54bb960 100644 --- a/firka/android/app/build.gradle.kts +++ b/firka/android/app/build.gradle.kts @@ -120,7 +120,10 @@ tasks.register("transformAndResignDebugApk") { dependsOn("assembleDebug") doLast { - transformApks(true) + if (System.getenv("TRANSFORM_APK") != null + && System.getenv("TRANSFORM_APK") == "true") { + transformApks(true) + } } } @@ -131,7 +134,10 @@ tasks.register("transformAndResignReleaseApk") { dependsOn("assembleRelease") doLast { - transformApks(false) + if (System.getenv("TRANSFORM_APK") != null + && System.getenv("TRANSFORM_APK") == "true") { + transformApks(false) + } } } @@ -142,7 +148,10 @@ tasks.register("transformAndResignReleaseBundle") { dependsOn("bundleRelease") doLast { - transformAppBundle() + if (System.getenv("TRANSFORM_AAB") != null + && System.getenv("TRANSFORM_AAB") == "true") { + transformAppBundle() + } } } diff --git a/firka/lib/helpers/firka_bundle.dart b/firka/lib/helpers/firka_bundle.dart index 7c8ee0d2..e4151760 100644 --- a/firka/lib/helpers/firka_bundle.dart +++ b/firka/lib/helpers/firka_bundle.dart @@ -7,7 +7,8 @@ import 'package:flutter/foundation.dart'; import 'package:flutter/services.dart'; class FirkaBundle extends CachingAssetBundle { - final bool _compressedBundle = !kDebugMode && Platform.isAndroid; + // final bool _compressedBundle = !kDebugMode && Platform.isAndroid; + final bool _compressedBundle = false; Map? index; diff --git a/tools/linux/build_apk.sh b/tools/linux/build_apk.sh index 006afc8f..b037668e 100755 --- a/tools/linux/build_apk.sh +++ b/tools/linux/build_apk.sh @@ -33,5 +33,5 @@ if [ "$1" = "main" ]; then exit 1 fi else - flutter build apk --debug --target-platform android-arm,android-arm64,android-x64 + TRANSFORM_APK=true flutter build apk --debug --target-platform android-arm,android-arm64,android-x64 fi