diff options
author | David 'Digit' Turner <digit@google.com> | 2009-07-24 16:33:05 +0200 |
---|---|---|
committer | David 'Digit' Turner <digit@google.com> | 2009-07-24 16:33:05 +0200 |
commit | d68b48725d720a06b24932b170f528929856f3db (patch) | |
tree | 586ee05802b45313ba5b720480eae1dd33b8a479 /android | |
parent | 0b7cd6c0d6af071951a86810d2600d155fa53b05 (diff) | |
download | external_qemu-d68b48725d720a06b24932b170f528929856f3db.zip external_qemu-d68b48725d720a06b24932b170f528929856f3db.tar.gz external_qemu-d68b48725d720a06b24932b170f528929856f3db.tar.bz2 |
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.
Diffstat (limited to 'android')
-rw-r--r-- | android/android.h | 2 | ||||
-rw-r--r-- | android/boot-properties.c | 8 | ||||
-rw-r--r-- | android/boot-properties.h | 7 | ||||
-rw-r--r-- | android/utils/bufprint.c | 4 |
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 ); |