From c27f813900a3c114562efbb8df1065e94766fc48 Mon Sep 17 00:00:00 2001 From: The Android Open Source Project Date: Tue, 10 Feb 2009 15:43:59 -0800 Subject: auto import from //branches/cupcake/...@130745 --- android/globals.h | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'android/globals.h') 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 */ -- cgit v1.1