diff options
| author | David 'Digit' Turner <digit@android.com> | 2011-06-23 18:23:08 +0200 |
|---|---|---|
| committer | David 'Digit' Turner <digit@android.com> | 2011-08-04 13:15:35 +0200 |
| commit | 41c787acecaa497b2ee5fd8297feb7be976d0f1d (patch) | |
| tree | 855b110710bafb95d754a0da958fcaa1b2ea0341 /android/main.c | |
| parent | fd79a9a99d1fa1b811b65db366692fee00904021 (diff) | |
| download | external_qemu-41c787acecaa497b2ee5fd8297feb7be976d0f1d.zip external_qemu-41c787acecaa497b2ee5fd8297feb7be976d0f1d.tar.gz external_qemu-41c787acecaa497b2ee5fd8297feb7be976d0f1d.tar.bz2 | |
Fix -sysdir handling.
This is a back-port from master to tools_r13
This patch fixes the processing of the -sysdir option. Previously,
using -sysdir <path> would imply that the -system <path>/<path>/system.img
is used, which is incorrect.
Also fixes the skin search for the case where we are using the emulator
without a pre-existing AVD outside of platform builds (e.g. when running tests).
This happens with stuff like:
emulator -sysdir /path/to/known/sdk/platforms/<name>/images
The patch ensures that the /path/to/known/sdk/platforms/<name>/skins directory
is probed (this was the behaviour of the Tools R11 emulator).
Change-Id: Ibf7ad97de8e1da375f1049600807e0b3d30bfaaa
Orig-Change-Id: I32398bec0d7a28ead234f63c847d3ec95ed14b63
Orig-Change-Id: Id77ea9bdc55bb99c1bfbd2ade291ec41f31ec65d
Diffstat (limited to 'android/main.c')
| -rw-r--r-- | android/main.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/android/main.c b/android/main.c index 3629c83..ec7ea61 100644 --- a/android/main.c +++ b/android/main.c @@ -548,7 +548,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); |