From f92609e5d4025b1c00291949a1a769e523cc06ea Mon Sep 17 00:00:00 2001
From: Misha Vyrtsev <reeywhaar@gmail.com>
Date: Tue, 3 Feb 2026 15:18:39 +0300
Subject: [PATCH 1/3] Refactor variantPath creation for multiflavored paths

---
 .../src/commands/runAndroid/tryInstallAppOnDevice.ts        | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/packages/cli-platform-android/src/commands/runAndroid/tryInstallAppOnDevice.ts b/packages/cli-platform-android/src/commands/runAndroid/tryInstallAppOnDevice.ts
index 17bda4643..994f608ad 100644
--- a/packages/cli-platform-android/src/commands/runAndroid/tryInstallAppOnDevice.ts
+++ b/packages/cli-platform-android/src/commands/runAndroid/tryInstallAppOnDevice.ts
@@ -24,8 +24,10 @@ function tryInstallAppOnDevice(
       .split(/(?=[A-Z])/);
 
     // create path to output file, eg. `production/debug`
-    const variantPath =
-      variantFromSelectedTask?.join('/')?.toLowerCase() ?? defaultVariant;
+    // ensure multiflavored path is correct, e.g. `clientStagingDebug` -> `clientStaging/debug`
+    const variantPath = variantFromSelectedTask
+      ? `${variantFromSelectedTask.slice(0, -1).join("")}/${variantFromSelectedTask.at(-1).toLocaleLowerCase()}`
+      : defaultVariant;
     // create output file name, eg. `production-debug`
     const variantAppName =
       variantFromSelectedTask?.join('-')?.toLowerCase() ?? defaultVariant;

From 1ce5ecbfb6de09de8dbf1ce7c46103f51ddb4cd4 Mon Sep 17 00:00:00 2001
From: Misha Vyrtsev <reeywhaar@gmail.com>
Date: Wed, 4 Feb 2026 04:49:46 +0400
Subject: [PATCH 2/3] Fix TypeScript error with non-null assertion

---
 .../src/commands/runAndroid/tryInstallAppOnDevice.ts            | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/cli-platform-android/src/commands/runAndroid/tryInstallAppOnDevice.ts b/packages/cli-platform-android/src/commands/runAndroid/tryInstallAppOnDevice.ts
index 994f608ad..c7b565d82 100644
--- a/packages/cli-platform-android/src/commands/runAndroid/tryInstallAppOnDevice.ts
+++ b/packages/cli-platform-android/src/commands/runAndroid/tryInstallAppOnDevice.ts
@@ -26,7 +26,7 @@ function tryInstallAppOnDevice(
     // create path to output file, eg. `production/debug`
     // ensure multiflavored path is correct, e.g. `clientStagingDebug` -> `clientStaging/debug`
     const variantPath = variantFromSelectedTask
-      ? `${variantFromSelectedTask.slice(0, -1).join("")}/${variantFromSelectedTask.at(-1).toLocaleLowerCase()}`
+      ? `${variantFromSelectedTask.slice(0, -1).join("")}/${variantFromSelectedTask.at(-1)!.toLocaleLowerCase()}`
       : defaultVariant;
     // create output file name, eg. `production-debug`
     const variantAppName =

From 598c8d173376cfea666a0468c097790ce7c5e5b6 Mon Sep 17 00:00:00 2001
From: Vyrtsev Mikhail <reeywhaar@gmail.com>
Date: Fri, 13 Feb 2026 04:08:14 +0400
Subject: [PATCH 3/3] Fix lint

---
 .../src/commands/runAndroid/tryInstallAppOnDevice.ts          | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/cli-platform-android/src/commands/runAndroid/tryInstallAppOnDevice.ts b/packages/cli-platform-android/src/commands/runAndroid/tryInstallAppOnDevice.ts
index c7b565d82..f601b4450 100644
--- a/packages/cli-platform-android/src/commands/runAndroid/tryInstallAppOnDevice.ts
+++ b/packages/cli-platform-android/src/commands/runAndroid/tryInstallAppOnDevice.ts
@@ -26,7 +26,9 @@ function tryInstallAppOnDevice(
     // create path to output file, eg. `production/debug`
     // ensure multiflavored path is correct, e.g. `clientStagingDebug` -> `clientStaging/debug`
     const variantPath = variantFromSelectedTask
-      ? `${variantFromSelectedTask.slice(0, -1).join("")}/${variantFromSelectedTask.at(-1)!.toLocaleLowerCase()}`
+      ? `${variantFromSelectedTask
+          .slice(0, -1)
+          .join('')}/${variantFromSelectedTask.at(-1)!.toLocaleLowerCase()}`
       : defaultVariant;
     // create output file name, eg. `production-debug`
     const variantAppName =