diff options
| author | David 'Digit' Turner <digit@google.com> | 2009-12-03 13:50:00 -0800 |
|---|---|---|
| committer | David 'Digit' Turner <digit@google.com> | 2009-12-03 14:02:39 -0800 |
| commit | a383d02cb57dd7dadd382654175e51354073a139 (patch) | |
| tree | e691a100f4590b63979bdd125ecb798154e46b3f /android | |
| parent | 8b657e5deaa03b989b0b36791fcf2aa6b2882656 (diff) | |
| download | external_qemu-a383d02cb57dd7dadd382654175e51354073a139.zip external_qemu-a383d02cb57dd7dadd382654175e51354073a139.tar.gz external_qemu-a383d02cb57dd7dadd382654175e51354073a139.tar.bz2 | |
Extract emulator major version number from SDK Tools package revision.
The minor version number is now always 0, this makes the next
version number "5.0" currently in the eclair branch.
Diffstat (limited to 'android')
| -rw-r--r-- | android/android.h | 3 | ||||
| -rw-r--r-- | android/main.c | 6 |
2 files changed, 5 insertions, 4 deletions
diff --git a/android/android.h b/android/android.h index b19d8d3..ca6cfaf 100644 --- a/android/android.h +++ b/android/android.h @@ -12,9 +12,6 @@ #ifndef _qemu_android_h #define _qemu_android_h -#define ANDROID_VERSION_MAJOR 1 -#define ANDROID_VERSION_MINOR 14 - #define CONFIG_SHAPER 1 #include <stdlib.h> diff --git a/android/main.c b/android/main.c index 45ea968..e791efe 100644 --- a/android/main.c +++ b/android/main.c @@ -76,7 +76,11 @@ AndroidRotation android_framebuffer_rotation; #define STRINGIFY(x) _STRINGIFY(x) #define _STRINGIFY(x) #x -#define VERSION_STRING STRINGIFY(ANDROID_VERSION_MAJOR)"."STRINGIFY(ANDROID_VERSION_MINOR) +#ifdef ANDROID_SDK_TOOLS_REVISION +# define VERSION_STRING STRINGIFY(ANDROID_SDK_TOOLS_REVISION)".0" +#else +# define VERSION_STRING "standalone" +#endif #define KEYSET_FILE "default.keyset" SkinKeyset* android_keyset; |