feat(android): api level 36 + start up emulator with unknown target versions (#5842)

mukaschultze · web-flow · commit de2cb8c1e68b · 2025-07-26T18:20:43.000-07:00
diff --git a/lib/common/mobile/android/android-emulator-services.ts b/lib/common/mobile/android/android-emulator-services.ts
@@ -235,7 +235,7 @@ export class AndroidEmulatorServices
 		const minVersion = semver.coerce(AndroidVirtualDevice.MIN_ANDROID_VERSION);
 		const bestVersion = best && best.version && semver.coerce(best.version);
 
-		return bestVersion && semver.gte(bestVersion, minVersion) ? best : null;
+		return !bestVersion || semver.gte(bestVersion, minVersion) ? best : null;
 	}
 
 	private async waitForEmulatorBootToComplete(
diff --git a/lib/common/mobile/emulator-helper.ts b/lib/common/mobile/emulator-helper.ts
@@ -5,6 +5,7 @@ import { injector } from "../yok";
 export class EmulatorHelper implements Mobile.IEmulatorHelper {
 	// https://developer.android.com/guide/topics/manifest/uses-sdk-element
 	public mapAndroidApiLevelToVersion = {
+		"android-36": "16.0.0",
 		"android-35": "15.0.0",
 		"android-34": "14.0.0",
 		"android-33": "13.0.0",
diff --git a/packages/doctor/src/android-tools-info.ts b/packages/doctor/src/android-tools-info.ts
@@ -32,6 +32,7 @@ export class AndroidToolsInfo implements NativeScriptDoctor.IAndroidToolsInfo {
 			"android-33",
 			"android-34",
 			"android-35",
+			"android-36",
 		];
 
 		const isRuntimeVersionLessThan = (targetVersion: string) => {
diff --git a/packages/doctor/test/android-tools-info.ts b/packages/doctor/test/android-tools-info.ts
@@ -70,6 +70,7 @@ describe("androidToolsInfo", () => {
 						"android-33",
 						"android-34",
 						"android-35",
+						"android-36",
 					];
 				}
 			},

Original file line number	Diff line number	Diff line change
`@@ -235,7 +235,7 @@ export class AndroidEmulatorServices`
`235`	`235`	`const minVersion = semver.coerce(AndroidVirtualDevice.MIN_ANDROID_VERSION);`
`236`	`236`	`const bestVersion = best && best.version && semver.coerce(best.version);`
`237`	`237`
`238`		`- return bestVersion && semver.gte(bestVersion, minVersion) ? best : null;`
	`238`	`+ return !bestVersion \|\| semver.gte(bestVersion, minVersion) ? best : null;`
`239`	`239`	`}`
`240`	`240`
`241`	`241`	`private async waitForEmulatorBootToComplete(`
Original file line number	Diff line number	Diff line change
`@@ -70,6 +70,7 @@ describe("androidToolsInfo", () => {`
`70`	`70`	`"android-33",`
`71`	`71`	`"android-34",`
`72`	`72`	`"android-35",`
	`73`	`+ "android-36",`
`73`	`74`	`];`
`74`	`75`	`}`
`75`	`76`	`},`