diff options
| author | David 'Digit' Turner <digit@android.com> | 2011-03-01 14:58:23 +0100 |
|---|---|---|
| committer | David 'Digit' Turner <digit@android.com> | 2011-03-01 16:09:13 +0100 |
| commit | 53eb66db4eba72d2e4fc951456be725e14243f25 (patch) | |
| tree | fa55aa1c310db2b48cc49bbbc3dc2c5e76e5097a /android | |
| parent | 143a7553845c11028f867eb3f3e2f10c66b591c6 (diff) | |
| download | external_qemu-53eb66db4eba72d2e4fc951456be725e14243f25.zip external_qemu-53eb66db4eba72d2e4fc951456be725e14243f25.tar.gz external_qemu-53eb66db4eba72d2e4fc951456be725e14243f25.tar.bz2 | |
Move AVD name initialization to the core.
Use a hardware property to send the AVD name to the core.
The -android-avdname core option is still supported though.
Change-Id: I4daac5c9fb65ed5261b5c04c1e1a18daed057a3f
Diffstat (limited to 'android')
| -rw-r--r-- | android/avd/hardware-properties.ini | 8 | ||||
| -rw-r--r-- | android/avd/hw-config-defs.h | 7 | ||||
| -rw-r--r-- | android/main.c | 3 |
3 files changed, 16 insertions, 2 deletions
diff --git a/android/avd/hardware-properties.ini b/android/avd/hardware-properties.ini index 5ecfcc4..6b5caae 100644 --- a/android/avd/hardware-properties.ini +++ b/android/avd/hardware-properties.ini @@ -276,3 +276,11 @@ type = string default = abstract = Path to snapshot storage description = Path to a 'snapshot storage' file, where all snapshots are stored. + +# Android AVD name +# This is set automatically before launching a core. +# +name = avd.name +type = string +default = <build> +abstract = Name of the AVD being run diff --git a/android/avd/hw-config-defs.h b/android/avd/hw-config-defs.h index e2def30..0ab1f0f 100644 --- a/android/avd/hw-config-defs.h +++ b/android/avd/hw-config-defs.h @@ -269,6 +269,13 @@ HWCFG_STRING( "Path to snapshot storage", "Path to a 'snapshot storage' file, where all snapshots are stored.") +HWCFG_STRING( + avd_name, + "avd.name", + "<build>", + "Name of the AVD being run", + "") + #undef HWCFG_INT #undef HWCFG_BOOL #undef HWCFG_DISKSIZE diff --git a/android/main.c b/android/main.c index 64314b0..acc91e6 100644 --- a/android/main.c +++ b/android/main.c @@ -1020,8 +1020,7 @@ int main(int argc, char **argv) /* physical memory is now in hw->hw_ramSize */ - args[n++] = "-android-avdname"; - args[n++] = (char*) avdInfo_getName(avd); + hw->avd_name = ASTRDUP(avdInfo_getName(avd)); /* Set up the interfaces for inter-emulator networking */ if (opts->shared_net_id) { |