diff options
author | The Android Open Source Project <initial-contribution@android.com> | 2010-04-19 10:35:36 -0700 |
---|---|---|
committer | The Android Open Source Project <initial-contribution@android.com> | 2010-04-19 10:35:47 -0700 |
commit | c306052006efb151cc10c28ce2f0087b8ded5e1c (patch) | |
tree | 9bf3d4e42f59c9a1a2a9d30716d387c65a50d727 /android/main.c | |
parent | aea1b87e31b952a733fe6cc6a0be4493a78ea961 (diff) | |
parent | 92568958dd42bf35667cc6451b5edd7f7d1f73a1 (diff) | |
download | external_qemu-c306052006efb151cc10c28ce2f0087b8ded5e1c.zip external_qemu-c306052006efb151cc10c28ce2f0087b8ded5e1c.tar.gz external_qemu-c306052006efb151cc10c28ce2f0087b8ded5e1c.tar.bz2 |
merge from tools_r6
Change-Id: I860d4b338cba9ea749797d6607b262c8072dd1f6
Diffstat (limited to 'android/main.c')
-rw-r--r-- | android/main.c | 36 |
1 files changed, 2 insertions, 34 deletions
diff --git a/android/main.c b/android/main.c index 6a345f9..f00e1da 100644 --- a/android/main.c +++ b/android/main.c @@ -1798,7 +1798,6 @@ int main(int argc, char **argv) int n; char* opt; int use_sdcard_img = 0; - int use_sdcard2_img = 0; int serial = 0; int gps_serial = 0; int radio_serial = 0; @@ -2063,14 +2062,6 @@ int main(int argc, char **argv) D("autoconfig: -sdcard %s", opts->sdcard); } } - - if (!opts->sdcard2 && opts->datadir) { - bufprint(tmp, tmpend, "%s/sdcard2.img", opts->datadir); - if (path_exists(tmp)) { - opts->sdcard2 = qemu_strdup(tmp); - D("autoconfig: -sdcard2 %s", opts->sdcard2); - } - } } /* setup the virtual device parameters from our options @@ -2091,7 +2082,6 @@ int main(int argc, char **argv) _forceAvdImagePath(AVD_IMAGE_USERDATA, opts->data, "user data", 0); _forceAvdImagePath(AVD_IMAGE_CACHE, opts->cache, "cache", 0); _forceAvdImagePath(AVD_IMAGE_SDCARD, opts->sdcard, "SD Card", 0); - _forceAvdImagePath(AVD_IMAGE_SDCARD2, opts->sdcard2, "SD Card 2", 0); /* we don't accept -skindir without -skin now * to simplify the autoconfig stuff with virtual devices @@ -2490,14 +2480,11 @@ int main(int argc, char **argv) args[n++] = strdup(tmp); } - if (hw->hw_sdCard != 0) { + if (hw->hw_sdCard != 0) opts->sdcard = (char*) avdInfo_getImageFile(avd, AVD_IMAGE_SDCARD); - opts->sdcard2 = (char*) avdInfo_getImageFile(avd, AVD_IMAGE_SDCARD2); - - } else if (opts->sdcard || opts->sdcard2) { + else if (opts->sdcard) { dwarning( "Emulated hardware doesn't support SD Cards" ); opts->sdcard = NULL; - opts->sdcard2 = NULL; } if(opts->sdcard) { @@ -2519,25 +2506,6 @@ int main(int argc, char **argv) } } - if(opts->sdcard2) { - uint64_t size; - if (path_get_size(opts->sdcard2, &size) == 0) { - /* see if we have an sdcard image. get its size if it exists */ - /* due to what looks like limitations of the MMC protocol, one has - * to use an SD Card image that is equal or larger than 9 MB - */ - if (size < 9*1024*1024ULL) { - fprintf(stderr, "### WARNING: SD Card files must be at least 9MB, ignoring '%s'\n", opts->sdcard2); - } else { - args[n++] = "-hdb"; - args[n++] = opts->sdcard2; - use_sdcard2_img = 1; - } - } else { - D("no SD Card image at '%s'", opts->sdcard2); - } - } - if (!opts->logcat || opts->logcat[0] == 0) { opts->logcat = getenv("ANDROID_LOG_TAGS"); if (opts->logcat && opts->logcat[0] == 0) |