Fix ANDROID_SDK_HOME handling on Unix (the env. var was ignored)

Bump version number to 1.11 in android/android.h
Update CHANGES.TXT to reflect SDK 1.5_r3 changes
Update some comments in android/boot-properties.[hc]
Add a --debug option to android-configure.sh (and android-rebuild.sh)
to build a unoptimized debug version of the standalone emulator binary.

6 files changed, 38 insertions, 11 deletions

diff --git a/CHANGES.TXT b/CHANGES.TXT
index b95c9f6..b4bcdf9 100644
--- a/CHANGES.TXT
+++ b/CHANGES.TXT
@@ -12,8 +12,18 @@ Versions:
    1.6 => SDK 1.0_r1
    1.7 => SDK 1.0_r2
    1.8 => SDK 1.1
-   1.9 => SDK 1.5_r1
-   1.10 => unreleased yet
+   1.9 => SDK 1.5_r1 (and SDK 1.5_r2)
+   1.10 => SDK 1.5_r3
+   1.11 => current
+
+==============================================================================
+Changes between 1.11 and 1.10
+
+IMPORTANT BUG FIXES:
+
+- Fixed ANDROID_SDK_HOME being ignored on Unix (not Windows). This environment
+  variable is used to locate a user's configuration files for the SDK, with a
+  default value of ~/.android
 
 ==============================================================================
 Changes between 1.10 and 1.9
@@ -41,6 +51,9 @@ IMPORTANT CHANGES:
   by init before anything else. Any "ro." property in them cannot be
   changed with this option.
 
+- Allow the HTTP proxy implementation to receive chunked encoding data.
+  This shall solve problems when talking to Microsoft proxies.
+
 OTHER:
 
 - Allow the SEARCH key-binding (F5) to work on keyboard-less hardware
@@ -59,7 +72,8 @@ OTHER:
 - Fixed build for platforms where deprecated symbol EAI_NODATA is not
   defined.
 
-- 
+- Fix GPS emulation to allow several clients concurrently. There are still
+  problems that may be due to changes in the system's framework.
 
 - Added some technical documentation in the docs/ directory.
 
diff --git a/android-configure.sh b/android-configure.sh
index 7a94ec2..59ec9b4 100755
--- a/android-configure.sh
+++ b/android-configure.sh
@@ -27,6 +27,7 @@ OPTION_IGNORE_AUDIO=no
 OPTION_NO_PREBUILTS=no
 OPTION_TRY_64=no
 OPTION_HELP=no
+OPTION_DEBUG=no
 
 if [ -z "$CC" ] ; then
   CC=gcc
@@ -44,6 +45,8 @@ for opt do
         VERBOSE=yes
     fi
   ;;
+  --debug) OPTION_DEBUG=yes
+  ;;
   --install=*) OPTION_TARGETS="$OPTION_TARGETS $optarg";
   ;;
   --sdl-config=*) SDL_CONFIG=$optarg
@@ -85,6 +88,7 @@ EOF
     echo "  --no-prebuilts           do not use prebuilt libraries and compiler"
     echo "  --try-64                 try to build a 64-bit executable (may crash)"
     echo "  --verbose                verbose configuration"
+    echo "  --debug                  build debug version of the emulator"
     echo ""
     exit 1
 fi
@@ -370,7 +374,9 @@ echo "CONFIG_ESD        := $PROBE_ESD" >> $config_mk
 echo "CONFIG_ALSA       := $PROBE_ALSA" >> $config_mk
 echo "CONFIG_OSS        := $PROBE_OSS" >> $config_mk
 echo "BUILD_STANDALONE_EMULATOR := true" >> $config_mk
-
+if [ $OPTION_DEBUG = yes ] ; then
+    echo "BUILD_DEBUG_EMULATOR := true" >> $config_mk
+fi
 
 # Build the config-host.h file
 #
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 );