From 615c072079c6c653de14c70573199411862fdcd1 Mon Sep 17 00:00:00 2001
From: Hugh Sanderson <gamehaxe@gmail.com>
Date: Wed, 10 Jul 2024 10:10:26 +0800
Subject: [PATCH] Do not use different versionCodes when building bundleApks

---
 templates/android/PROJ-gradle/app/build.gradle | 2 ++
 tools/nme/src/CommandLineTools.hx              | 1 +
 tools/nme/src/platforms/AndroidPlatform.hx     | 1 +
 tools/nme/src/project/NMEProject.hx            | 2 ++
 4 files changed, 6 insertions(+)

diff --git a/templates/android/PROJ-gradle/app/build.gradle b/templates/android/PROJ-gradle/app/build.gradle
index ae6f767c5..01ccee807 100644
--- a/templates/android/PROJ-gradle/app/build.gradle
+++ b/templates/android/PROJ-gradle/app/build.gradle
@@ -121,6 +121,7 @@ dependencies {
     }
 }
 
+::if !NME_BUNDLE_RELEASE::
 /* Assigns a different version code for each output APK
     other than the universal APK. */
 
@@ -140,3 +141,4 @@ android.applicationVariants.all { variant ->
         }
     }
 }
+::end::
diff --git a/tools/nme/src/CommandLineTools.hx b/tools/nme/src/CommandLineTools.hx
index 53f9989bc..71d46e906 100644
--- a/tools/nme/src/CommandLineTools.hx
+++ b/tools/nme/src/CommandLineTools.hx
@@ -1067,6 +1067,7 @@ class CommandLineTools
             {
                if (project.command!="uploadcrashlytics")
                   project.command = "build";
+               project.androidConfig.bundleApk = true;
             }
             words.splice(w,1);
             break;
diff --git a/tools/nme/src/platforms/AndroidPlatform.hx b/tools/nme/src/platforms/AndroidPlatform.hx
index 2e665b04c..6f78e8b2e 100644
--- a/tools/nme/src/platforms/AndroidPlatform.hx
+++ b/tools/nme/src/platforms/AndroidPlatform.hx
@@ -337,6 +337,7 @@ class AndroidPlatform extends Platform
       
       context.ABIS = [for(abi in includedABIs()) '"${abi.name}"'].join(', ');
       context.ABI_CODES = [for(abi in includedABIs()) '\'${abi.name}\':${abi.versionCodeScaler}'].join(', ');
+      context.NME_BUNDLE_RELEASE = project.androidConfig.bundleApk;
    }
 
    function getNdkStackExe()
diff --git a/tools/nme/src/project/NMEProject.hx b/tools/nme/src/project/NMEProject.hx
index c981d1c2b..c300ba3d2 100644
--- a/tools/nme/src/project/NMEProject.hx
+++ b/tools/nme/src/project/NMEProject.hx
@@ -13,6 +13,7 @@ class AndroidConfig
    public var minApiLevel:Int;
    public var addV4Compat:Bool;
    public var universalApk:Bool;
+   public var bundleApk:Bool;
    public var targetApiLevel:Null<Int>;
    public var buildApiLevel:Null<Int>;
    public var appHeader:Array<String>;
@@ -34,6 +35,7 @@ class AndroidConfig
       minApiLevel = 21;
       addV4Compat = false;
       universalApk = false;
+      bundleApk = false;
       appHeader = [];
       appIntent = [];
       appActivity = [];