diff options
| author | David 'Digit' Turner <digit@google.com> | 2009-12-03 14:11:38 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-12-03 14:11:38 -0800 |
| commit | e48bd04f0b59e5b6a8bea4718e3b2f587c711bba (patch) | |
| tree | dc50a020295572b4020ea147b0f3999d113ea523 /android | |
| parent | 8fa4d03021927c765331f1e320226ae4923e9f6e (diff) | |
| parent | a383d02cb57dd7dadd382654175e51354073a139 (diff) | |
| download | external_qemu-e48bd04f0b59e5b6a8bea4718e3b2f587c711bba.zip external_qemu-e48bd04f0b59e5b6a8bea4718e3b2f587c711bba.tar.gz external_qemu-e48bd04f0b59e5b6a8bea4718e3b2f587c711bba.tar.bz2 | |
am a383d02c: Extract emulator major version number from SDK Tools package revision.
Merge commit 'a383d02cb57dd7dadd382654175e51354073a139' into eclair-plus-aosp
* commit 'a383d02cb57dd7dadd382654175e51354073a139':
Extract emulator major version number from SDK Tools package revision.
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; |