4 files changed, 14 insertions, 7 deletions
diff --git a/android/android.h b/android/android.h
index 17c7c48..6d23e6e 100644
--- a/android/android.h
+++ b/android/android.h
@@ -13,7 +13,7 @@
 #define  _qemu_android_h
 
 #define  ANDROID_VERSION_MAJOR  1
-#define  ANDROID_VERSION_MINOR  10
+#define  ANDROID_VERSION_MINOR  11
 
 #define  CONFIG_SHAPER  1
 
diff --git a/android/boot-properties.c b/android/boot-properties.c
index 1c714e9..19941a0 100644
--- a/android/boot-properties.c
+++ b/android/boot-properties.c
@@ -27,6 +27,10 @@
 #define  T(...)   ((void)0)
 #endif
 
+/* this code supports the list of system properties that will
+ * be set on boot in the emulated system.
+ */
+
 typedef struct BootProperty {
     struct BootProperty*  next;
     char*                 property;
@@ -59,10 +63,6 @@ static BootProperty*   _boot_properties;
 static BootProperty**  _boot_properties_tail = &_boot_properties;
 static int             _inited;
 
-/* this code supports the list of system properties that will
- * be set on boot in the emulated system.
- */
-
 int
 boot_property_add2( const char*  name, int  namelen,
                     const char*  value, int  valuelen )
diff --git a/android/boot-properties.h b/android/boot-properties.h
index 6711c59..c390ef3 100644
--- a/android/boot-properties.h
+++ b/android/boot-properties.h
@@ -13,6 +13,11 @@
 #ifndef _ANDROID_BOOT_PROPERTIES_H
 #define _ANDROID_BOOT_PROPERTIES_H
 
+/* Manage the set of boot system properties.
+ * See the documentation for the 'boot-properties' service
+ * in docs/ANDROID-QEMUD-SERVICES.TXT
+ */
+
 /* these values give the maximum length of system property
  * names and values. They must match the corresponding definitions
  * in the Android source tree (in system/core/include/cutils/properties.h)
@@ -40,7 +45,7 @@ int  boot_property_add2( const char*  name, int  namelen,
  */
 void  boot_property_init_service( void );
 
-/* parse the parameter the list of -prop options passed on the command line
+/* parse the parameter of -prop options passed on the command line
  */
 void  boot_property_parse_option( const char*  param );
 
diff --git a/android/utils/bufprint.c b/android/utils/bufprint.c
index 4309a4b..45d411f 100644
--- a/android/utils/bufprint.c
+++ b/android/utils/bufprint.c
@@ -180,7 +180,9 @@ bufprint_config_path(char*  buff, char*  end)
         return bufprint(buff, end, "%s\\%s", path, _ANDROID_PATH );
     }
 #else
-    const char*  home = getenv("HOME");
+    const char*  home = getenv("ANDROID_SDK_HOME");
+    if (home == NULL)
+        home = getenv("HOME");
     if (home == NULL)
         home = "/tmp";
     return bufprint(buff, end, "%s/%s", home, _ANDROID_PATH );