diff options
author | David 'Digit' Turner <digit@android.com> | 2011-03-01 07:09:47 -0800 |
---|---|---|
committer | Android Code Review <code-review@android.com> | 2011-03-01 07:09:47 -0800 |
commit | 68a65132248c244003b820e9ae7c60cda336ba45 (patch) | |
tree | fa55aa1c310db2b48cc49bbbc3dc2c5e76e5097a /vl-android.c | |
parent | 143a7553845c11028f867eb3f3e2f10c66b591c6 (diff) | |
parent | 53eb66db4eba72d2e4fc951456be725e14243f25 (diff) | |
download | external_qemu-68a65132248c244003b820e9ae7c60cda336ba45.zip external_qemu-68a65132248c244003b820e9ae7c60cda336ba45.tar.gz external_qemu-68a65132248c244003b820e9ae7c60cda336ba45.tar.bz2 |
Merge "Move AVD name initialization to the core."
Diffstat (limited to 'vl-android.c')
-rw-r--r-- | vl-android.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/vl-android.c b/vl-android.c index a5510a0..d94bec0 100644 --- a/vl-android.c +++ b/vl-android.c @@ -4891,6 +4891,14 @@ int main(int argc, char **argv, char **envp) } #endif // CONFIG_NAND_LIMITS + /* Initialize AVD name from hardware configuration if needed */ + if (!android_op_avd_name) { + if (android_hw->avd_name && *android_hw->avd_name) { + android_op_avd_name = android_hw->avd_name; + VERBOSE_PRINT(init,"AVD Name: %s", android_op_avd_name); + } + } + /* Initialize system partition image */ { char tmp[PATH_MAX+32]; |