From a3c399936c53f391f747367414a2dfc211a8cf4c Mon Sep 17 00:00:00 2001
From: Andre Greeff <agreeff@nortech.co.za>
Date: Tue, 6 Sep 2022 16:51:46 +0200
Subject: [PATCH] fix(android): parse environment variable provided paths with
 `fs.realpath`

this closes #244, as it allows `native-run` to function as designed when various aspects of the Android SDK installation are referenced by symbolic links instead of real folder paths.
---
 src/android/utils/sdk/index.ts | 36 ++++++++++++++++++++++++----------
 1 file changed, 26 insertions(+), 10 deletions(-)

diff --git a/src/android/utils/sdk/index.ts b/src/android/utils/sdk/index.ts
index c9683a9..1386a31 100644
--- a/src/android/utils/sdk/index.ts
+++ b/src/android/utils/sdk/index.ts
@@ -1,4 +1,4 @@
-import { mkdirp, readdirp } from '@ionic/utils-fs';
+import { mkdirp, readdirp, realpath } from '@ionic/utils-fs';
 import * as Debug from 'debug';
 import * as os from 'os';
 import * as pathlib from 'path';
@@ -165,8 +165,12 @@ export async function resolveSDKRoot(): Promise<string> {
   // $ANDROID_HOME is deprecated, but still overrides $ANDROID_SDK_ROOT if
   // defined and valid.
   if (process.env.ANDROID_HOME && (await isDir(process.env.ANDROID_HOME))) {
-    debug('Using $ANDROID_HOME at %s', process.env.ANDROID_HOME);
-    return process.env.ANDROID_HOME;
+    const realAndroidHome = await realpath(process.env.ANDROID_HOME);
+    if (realAndroidHome !== process.env.ANDROID_HOME) {
+      debug('[NOTE] $ANDROID_HOME looks like a symlink, resolved the real path as "%s"', realAndroidHome);
+    }
+    debug('Interpreting $ANDROID_HOME at %s', realAndroidHome);
+    return realAndroidHome;
   }
 
   debug('Looking for $ANDROID_SDK_ROOT');
@@ -176,8 +180,12 @@ export async function resolveSDKRoot(): Promise<string> {
     process.env.ANDROID_SDK_ROOT &&
     (await isDir(process.env.ANDROID_SDK_ROOT))
   ) {
-    debug('Using $ANDROID_SDK_ROOT at %s', process.env.ANDROID_SDK_ROOT);
-    return process.env.ANDROID_SDK_ROOT;
+    const realAndroidSdkRoot = await realpath(process.env.ANDROID_SDK_ROOT);
+    if (realAndroidSdkRoot !== process.env.ANDROID_SDK_ROOT) {
+      debug('[NOTE] $ANDROID_SDK_ROOT looks like a symlink, resolved the real path as "%s"', realAndroidSdkRoot);
+    }
+    debug('Interpreting $ANDROID_SDK_ROOT at %s', realAndroidSdkRoot);
+    return realAndroidSdkRoot;
   }
 
   const sdkDirs = SDK_DIRECTORIES.get(process.platform);
@@ -206,11 +214,15 @@ export async function resolveEmulatorHome(): Promise<string> {
     process.env.ANDROID_EMULATOR_HOME &&
     (await isDir(process.env.ANDROID_EMULATOR_HOME))
   ) {
+    const realAndroidEmulatorHome = await realpath(process.env.ANDROID_EMULATOR_HOME);
+    if (realAndroidEmulatorHome !== process.env.ANDROID_EMULATOR_HOME) {
+      debug('[NOTE] $ANDROID_EMULATOR_HOME looks like a symlink, resolved the real path as "%s"', realAndroidEmulatorHome);
+    }
     debug(
-      'Using $ANDROID_EMULATOR_HOME at %s',
-      process.env.$ANDROID_EMULATOR_HOME,
+      'Interpreting $ANDROID_EMULATOR_HOME at %s',
+      realAndroidEmulatorHome,
     );
-    return process.env.ANDROID_EMULATOR_HOME;
+    return realAndroidEmulatorHome;
   }
 
   debug('Looking at $HOME/.android');
@@ -237,8 +249,12 @@ export async function resolveAVDHome(): Promise<string> {
     process.env.ANDROID_AVD_HOME &&
     (await isDir(process.env.ANDROID_AVD_HOME))
   ) {
-    debug('Using $ANDROID_AVD_HOME at %s', process.env.$ANDROID_AVD_HOME);
-    return process.env.ANDROID_AVD_HOME;
+    const realAndroidAVDHome = await realpath(process.env.ANDROID_AVD_HOME);
+    if (realAndroidAVDHome !== process.env.ANDROID_AVD_HOME) {
+      debug('[NOTE] $ANDROID_AVD_HOME looks like a symlink, resolved the real path as "%s"', realAndroidAVDHome);
+    }
+    debug('Interpreting $ANDROID_AVD_HOME at %s', realAndroidAVDHome);
+    return realAndroidAVDHome;
   }
 
   debug('Looking at $HOME/.android/avd');