AIRPlatform, AIRHelper: add -aab and -android-studio options for lime build air -android to create non-apk packages

Consolidate file extension selection into AIRHelper.build() too, since it depends on which target is selected now

Author: joshtynjala

src/lime/tools/AIRHelper.hx

@@ -5,23 +5,13 @@ import sys.FileSystem;
 
 class AIRHelper
 {
-	public static function build(project:HXProject, workingDirectory:String, targetPlatform:Platform, targetPath:String, applicationXML:String,
+	public static function build(project:HXProject, workingDirectory:String, targetPlatform:Platform, targetPathWithoutExtension:String, applicationXML:String,
 			files:Array<String>, fileDirectory:String = null):String
 	{
-		// var airTarget = "air";
-		// var extension = ".air";
 		var airTarget = "bundle";
-		var extension = "";
 
-		switch (targetPlatform)
+		switch(targetPlatform)
 		{
-			case MAC:
-
-				if (airTarget == "bundle")
-				{
-					extension = ".app";
-				}
-
 			case IOS:
 				if (project.targetFlags.exists("simulator"))
 				{
@@ -75,19 +65,84 @@ class AIRHelper
 					}
 				}
 
-			// extension = ".ipa";
+			case ANDROID:
+				if (project.targetFlags.exists("aab"))
+				{
+					if (project.debug)
+					{
+						airTarget = "aab-debug";
+					}
+					else
+					{
+						airTarget = "aab";
+					}
+				}
+				else if (project.targetFlags.exists("android-studio"))
+				{
+					if (project.debug)
+					{
+						airTarget = "android-studio-debug";
+					}
+					else
+					{
+						airTarget = "android-studio";
+					}
+				}
+				else
+				{
+					if (project.debug)
+					{
+						airTarget = "apk-debug";
+					}
+					else
+					{
+						airTarget = "apk";
+					}
+				}
+
+			default:
+		}
+
+		var extension = "";
+
+		switch (targetPlatform)
+		{
+			case WINDOWS:
+
+				if (airTarget == "air")
+				{
+					extension = ".air";
+				}
+
+			case MAC:
+
+				if (airTarget == "bundle")
+				{
+					extension = ".app";
+				}
+				else if (airTarget == "air")
+				{
+					extension = ".air";
+				}
 
 			case ANDROID:
-				if (project.debug)
+
+				if (StringTools.startsWith(airTarget, "aab"))
 				{
-					airTarget = "apk-debug";
+					extension = ".aab";
+				}
+				else if (StringTools.startsWith(airTarget, "android-studio"))
+				{
+					// no extension
 				}
 				else
 				{
-					airTarget = "apk";
+					extension = ".apk";
 				}
 
-			// extension = ".apk";
+			case IOS:
+
+				extension = ".ipa";
 
 			default:
 		}
@@ -188,7 +243,7 @@ class AIRHelper
 			}
 		}
 
-		args = args.concat([targetPath + extension, applicationXML]);
+		args = args.concat([targetPathWithoutExtension + extension, applicationXML]);
 
 		if (targetPlatform == IOS && System.hostPlatform == MAC && project.targetFlags.exists("simulator"))
 		{
@@ -236,7 +291,7 @@ class AIRHelper
 
 		System.runCommand(workingDirectory, project.defines.get("AIR_SDK") + "/bin/adt", args);
 
-		return targetPath + extension;
+		return targetPathWithoutExtension + extension;
 	}
 
 	public static function getExtDirs(project:HXProject):Array<String>

tools/platforms/AIRPlatform.hx

@@ -157,14 +157,9 @@ class AIRPlatform extends FlashPlatform
 				files.push(splashScreen.path);
 			}
 
-			var targetPath = switch (targetPlatform)
-			{
-				case ANDROID: "bin/" + project.app.file + ".apk";
-				case IOS: "bin/" + project.app.file + ".ipa";
-				default: "bin/" + project.app.file + ".air";
-			}
+			var targetPathWithoutExtension = "bin/" + project.app.file;
 
-			AIRHelper.build(project, targetDirectory, targetPlatform, targetPath, "application.xml", files, "bin");
+			AIRHelper.build(project, targetDirectory, targetPlatform, targetPathWithoutExtension, "application.xml", files, "bin");
 		}
 	}
 
@@ -196,19 +191,19 @@ class AIRPlatform extends FlashPlatform
 					name += " (macOS)";
 
 				case IOS:
-					name += " (iOS).ipa";
+					name += " (iOS)";
 
 				case ANDROID:
-					name += " (Android).apk";
+					name += " (Android)";
 
 				default:
 			}
 
-			var outputPath = "dist/" + name;
+			var outputPathWithoutExtension = "dist/" + name;
 
 			System.mkdir(targetDirectory + "/dist");
 
-			outputPath = AIRHelper.build(project, targetDirectory, targetPlatform, outputPath, "application.xml", files, "bin");
+			var outputPath = AIRHelper.build(project, targetDirectory, targetPlatform, outputPathWithoutExtension, "application.xml", files, "bin");
 
 			if (targetPlatformType == DESKTOP)
 			{