From ea2837728272b04bd236a74cd1ea547ec6f63c20 Mon Sep 17 00:00:00 2001
From: David 'Digit' Turner <digit@android.com>
Date: Thu, 7 Jul 2011 04:40:27 +0200
Subject: Fix a small bug in the -sysdir handling.

The issue was that auto-configuration would set the value of -system
to point to the full path of the system image (e.g. <sysdir>/system.img).

Later, the emulator would try to load the <sysdir>/<sysdir>/system.img due
to this.

Change-Id: Id77ea9bdc55bb99c1bfbd2ade291ec41f31ec65d
---
 android/main.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/android/main.c b/android/main.c
index cd3fd08..f20ea7b 100644
--- a/android/main.c
+++ b/android/main.c
@@ -549,7 +549,7 @@ int main(int argc, char **argv)
             }
 
             /* If -system <name> is used, use it to find the initial image */
-            if (opts->sysdir != NULL) {
+            if (opts->sysdir != NULL && !path_exists(opts->system)) {
                 initImage = _getFullFilePath(opts->sysdir, opts->system);
             } else {
                 initImage = ASTRDUP(opts->system);
-- 
cgit v1.1