AI 143329: am: CL 143179 am: CL 142901 Avoid a segmentation fault in the emulator when trying to use an AVD while
ANDROID_PRODUCT_OUT is not defined. Argh..
Original author: digit
Merged from: //branches/cupcake/...
Original author: android-build
Merged from: //branches/donutburger/...
Automated import of CL 143329
diff --git a/android/avd/info.c b/android/avd/info.c
index 2f0e5a9..11c5d19 100644
--- a/android/avd/info.c
+++ b/android/avd/info.c
@@ -1355,6 +1355,7 @@
iniFile_free(ini);
/* special product-specific hardware configuration */
+ if (i->androidOut != NULL)
{
char* p = strrchr(i->androidOut, '/');
if (p != NULL && p[0] != 0) {