aboutsummaryrefslogtreecommitdiffstats
path: root/android
diff options
context:
space:
mode:
authorThe Android Open Source Project <initial-contribution@android.com>2011-02-17 11:35:59 -0800
committerThe Android Open Source Project <initial-contribution@android.com>2011-02-17 11:35:59 -0800
commit2ee095966aba5003799675b2ccbb5d629dfc7dde (patch)
treefc9de4cbff7767be9dc307ea42b7d07067d34bb8 /android
parent4b1ada13d72fcc63f5a05b25694506fa3a2269d9 (diff)
parent601f3627157e8d994d35a58f5ee3187f04a6cb21 (diff)
downloadexternal_qemu-2ee095966aba5003799675b2ccbb5d629dfc7dde.zip
external_qemu-2ee095966aba5003799675b2ccbb5d629dfc7dde.tar.gz
external_qemu-2ee095966aba5003799675b2ccbb5d629dfc7dde.tar.bz2
merge from tools_r10
Change-Id: I8730ebf34c07bf1a5167970ee1fdce4fb3094c54
Diffstat (limited to 'android')
-rw-r--r--android/main-ui.c3
-rw-r--r--android/main.c3
2 files changed, 6 insertions, 0 deletions
diff --git a/android/main-ui.c b/android/main-ui.c
index 21b3aa3..f1f8539 100644
--- a/android/main-ui.c
+++ b/android/main-ui.c
@@ -1447,6 +1447,9 @@ int main(int argc, char **argv)
args[n++] = "unix";
#endif
+ args[n++] = "-android-avdname";
+ args[n++] = avdInfo_getName(avd);
+
/* Set up the interfaces for inter-emulator networking */
if (opts->shared_net_id) {
unsigned int shared_net_id = atoi(opts->shared_net_id);
diff --git a/android/main.c b/android/main.c
index 9eddb70..7a228f0 100644
--- a/android/main.c
+++ b/android/main.c
@@ -1242,6 +1242,9 @@ int main(int argc, char **argv)
args[n++] = "unix";
#endif
+ args[n++] = "-android-avdname";
+ args[n++] = avdInfo_getName(avd);
+
/* Set up the interfaces for inter-emulator networking */
if (opts->shared_net_id) {
unsigned int shared_net_id = atoi(opts->shared_net_id);