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
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 @@
}
#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];