diff options
| author | The Android Open Source Project <initial-contribution@android.com> | 2009-02-10 15:43:59 -0800 |
|---|---|---|
| committer | The Android Open Source Project <initial-contribution@android.com> | 2009-02-10 15:43:59 -0800 |
| commit | c27f813900a3c114562efbb8df1065e94766fc48 (patch) | |
| tree | d95919283707dcab61009e27007374a745c9541e /android/globals.h | |
| parent | 0852ad57fa372f9b2854e4df685eaba8d8ef6790 (diff) | |
| download | external_qemu-c27f813900a3c114562efbb8df1065e94766fc48.zip external_qemu-c27f813900a3c114562efbb8df1065e94766fc48.tar.gz external_qemu-c27f813900a3c114562efbb8df1065e94766fc48.tar.bz2 | |
auto import from //branches/cupcake/...@130745
Diffstat (limited to 'android/globals.h')
| -rw-r--r-- | android/globals.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/android/globals.h b/android/globals.h index 625c84a..b26663d 100644 --- a/android/globals.h +++ b/android/globals.h @@ -12,22 +12,22 @@ #ifndef _ANDROID_GLOBALS_H #define _ANDROID_GLOBALS_H -#include "android/vm/info.h" -#include "android/vm/hw-config.h" +#include "android/avd/info.h" +#include "android/avd/hw-config.h" -/* this structure is setup when loading the virtual machine +/* this structure is setup when loading the virtual device * after that, you can read the 'flags' field to determine * wether a data or cache wipe has been in effect. */ -extern AvmInfoParams android_vmParams[1]; +extern AvdInfoParams android_avdParams[1]; -/* a pointer to the android virtual machine information +/* a pointer to the android virtual device information * object, which can be queried for the paths of various * image files or the skin */ -extern AvmInfo* android_vmInfo; +extern AvdInfo* android_avdInfo; -/* the hardware configuration for this specific virtual machine */ +/* the hardware configuration for this specific virtual device */ extern AndroidHwConfig android_hw[1]; #endif /* _ANDROID_GLOBALS_H */ |