Move '-list-avds' handling to top-level 'emulator' launcher.
The option only works when launching a classic emulation engine,
moving the code to 'emulator' makes it work with the new engine
as well.
Change-Id: Ie39f61273c0fb63d165b8791b54f0bc506be7fe9
diff --git a/android/main-emulator.c b/android/main-emulator.c
index 36b1561..3781eff 100644
--- a/android/main-emulator.c
+++ b/android/main-emulator.c
@@ -31,6 +31,7 @@
#include <android/utils/bufprint.h>
#include <android/utils/win32_cmdline_quote.h>
#include <android/opengl/emugl_config.h>
+#include <android/avd/scanner.h>
#include <android/avd/util.h>
/* Required by android/utils/debug.h */
@@ -136,6 +137,19 @@
continue;
}
+ if (!strcmp(opt,"-list-avds")) {
+ AvdScanner* scanner = avdScanner_new(NULL);
+ for (;;) {
+ const char* name = avdScanner_next(scanner);
+ if (!name) {
+ break;
+ }
+ printf("%s\n", name);
+ }
+ avdScanner_free(scanner);
+ exit(0);
+ }
+
if (!avdName) {
if (!strcmp(opt,"-avd") && nn+1 < argc) {
avdName = argv[nn+1];
diff --git a/android/main.c b/android/main.c
index 3b76058..89540ca 100755
--- a/android/main.c
+++ b/android/main.c
@@ -35,7 +35,6 @@
#include "math.h"
-#include "android/avd/scanner.h"
#include "android/config/config.h"
#include "android/kernel/kernel_utils.h"
@@ -249,19 +248,6 @@
exit(0);
}
- if (opts->list_avds) {
- AvdScanner* scanner = avdScanner_new(NULL);
- for (;;) {
- const char* name = avdScanner_next(scanner);
- if (!name) {
- break;
- }
- printf("%s\n", name);
- }
- avdScanner_free(scanner);
- exit(0);
- }
-
if (opts->snapshot_list) {
if (opts->snapstorage == NULL) {
/* Need to find the default snapstorage */
