Setup android_sdk before trying emulator

haxenme · Jun 3, 2024 · 58e2fac · 58e2fac
1 parent 18de17d
commit 58e2fac
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 0 deletions.
diff --git a/tools/nme/src/CommandLineTools.hx b/tools/nme/src/CommandLineTools.hx
@@ -1464,6 +1464,7 @@ class CommandLineTools
             generate();
 
          case "emulator":
+            getHXCPPConfig(project);
             var android = new platforms.AndroidPlatform(project);
             android.emulator(words);
 

diff --git a/tools/nme/src/platforms/AndroidPlatform.hx b/tools/nme/src/platforms/AndroidPlatform.hx
@@ -407,6 +407,7 @@ class AndroidPlatform extends Platform
          return null;
 
       var out = ProcessHelper.getOutput(exe, [ "-list-avds"]);
+      out = out.filter( x -> x.indexOf("INFO")!=0 );
       return out;
    }
 

diff --git a/tools/nme/src/platforms/Platform.hx b/tools/nme/src/platforms/Platform.hx
@@ -151,6 +151,7 @@ class Platform
             adbName = test;
          // Hmm - use relative path and hope it works
       }
+      Log.verbose('Using adb $adbName from ANDROID_SDK "${project.environment.get("ANDROID_SDK")}"');
 
       adbFlags = [];
       if (project.targetFlags.exists("device"))