am 90887627: ndk: Update headers and libraries for API level 9

* commit '90887627f185ea795fd8620bb916bd14a9f51041':
  ndk: Update headers and libraries for API level 9
This commit is contained in:
David 'Digit' Turner
2010-12-15 01:30:54 -08:00
committed by Android Git Automerger
22 changed files with 318 additions and 91 deletions

View File

@@ -0,0 +1,40 @@
eglBindAPI
eglBindTexImage
eglChooseConfig
eglCopyBuffers
eglCreateContext
eglCreateImageKHR
eglCreatePbufferFromClientBuffer
eglCreatePbufferSurface
eglCreatePixmapSurface
eglCreateWindowSurface
eglDestroyContext
eglDestroyImageKHR
eglDestroySurface
eglGetConfigAttrib
eglGetConfigs
eglGetCurrentContext
eglGetCurrentDisplay
eglGetCurrentSurface
eglGetDisplay
eglGetError
eglGetProcAddress
eglInitialize
eglLockSurfaceKHR
eglMakeCurrent
eglQueryAPI
eglQueryContext
eglQueryString
eglQuerySurface
eglReleaseTexImage
eglReleaseThread
eglSetSwapRectangleANDROID
eglSurfaceAttrib
eglSwapBuffers
eglSwapInterval
eglTerminate
eglUnlockSurfaceKHR
eglWaitClient
eglWaitGL
eglWaitNative

View File

@@ -1,3 +1,6 @@
slCreateEngine
slQueryNumSupportedEngineInterfaces
slQuerySupportedEngineInterfaces
SL_IID_3DCOMMIT
SL_IID_3DDOPPLER
SL_IID_3DGROUPING
@@ -47,6 +50,3 @@ SL_IID_VIBRA
SL_IID_VIRTUALIZER
SL_IID_VISUALIZATION
SL_IID_VOLUME
slCreateEngine
slQueryNumSupportedEngineInterfaces
slQuerySupportedEngineInterfaces

View File

@@ -0,0 +1,149 @@
AAssetDir_close
AAssetDir_getNextFileName
AAssetDir_rewind
AAssetManager_fromJava
AAssetManager_open
AAssetManager_openDir
AAsset_close
AAsset_getBuffer
AAsset_getLength
AAsset_getRemainingLength
AAsset_isAllocated
AAsset_openFileDescriptor
AAsset_read
AAsset_seek
AConfiguration_copy
AConfiguration_delete
AConfiguration_diff
AConfiguration_fromAssetManager
AConfiguration_getCountry
AConfiguration_getDensity
AConfiguration_getKeyboard
AConfiguration_getKeysHidden
AConfiguration_getLanguage
AConfiguration_getMcc
AConfiguration_getMnc
AConfiguration_getNavHidden
AConfiguration_getNavigation
AConfiguration_getOrientation
AConfiguration_getScreenLong
AConfiguration_getScreenSize
AConfiguration_getSdkVersion
AConfiguration_getTouchscreen
AConfiguration_getUiModeNight
AConfiguration_getUiModeType
AConfiguration_isBetterThan
AConfiguration_match
AConfiguration_new
AConfiguration_setCountry
AConfiguration_setDensity
AConfiguration_setKeyboard
AConfiguration_setKeysHidden
AConfiguration_setLanguage
AConfiguration_setMcc
AConfiguration_setMnc
AConfiguration_setNavHidden
AConfiguration_setNavigation
AConfiguration_setOrientation
AConfiguration_setScreenLong
AConfiguration_setScreenSize
AConfiguration_setSdkVersion
AConfiguration_setTouchscreen
AConfiguration_setUiModeNight
AConfiguration_setUiModeType
AInputEvent_getDeviceId
AInputEvent_getSource
AInputEvent_getType
AInputQueue_attachLooper
AInputQueue_detachLooper
AInputQueue_finishEvent
AInputQueue_getEvent
AInputQueue_hasEvents
AInputQueue_preDispatchEvent
AKeyEvent_getAction
AKeyEvent_getDownTime
AKeyEvent_getEventTime
AKeyEvent_getFlags
AKeyEvent_getKeyCode
AKeyEvent_getMetaState
AKeyEvent_getRepeatCount
AKeyEvent_getScanCode
ALooper_acquire
ALooper_addFd
ALooper_forThread
ALooper_pollAll
ALooper_pollOnce
ALooper_prepare
ALooper_release
ALooper_removeFd
ALooper_wake
AMotionEvent_getAction
AMotionEvent_getDownTime
AMotionEvent_getEdgeFlags
AMotionEvent_getEventTime
AMotionEvent_getFlags
AMotionEvent_getHistoricalEventTime
AMotionEvent_getHistoricalPressure
AMotionEvent_getHistoricalSize
AMotionEvent_getHistoricalX
AMotionEvent_getHistoricalY
AMotionEvent_getHistorySize
AMotionEvent_getMetaState
AMotionEvent_getOrientation
AMotionEvent_getPointerCount
AMotionEvent_getPointerId
AMotionEvent_getPressure
AMotionEvent_getRawX
AMotionEvent_getRawY
AMotionEvent_getSize
AMotionEvent_getToolMajor
AMotionEvent_getToolMinor
AMotionEvent_getTouchMajor
AMotionEvent_getTouchMinor
AMotionEvent_getX
AMotionEvent_getXOffset
AMotionEvent_getXPrecision
AMotionEvent_getY
AMotionEvent_getYOffset
AMotionEvent_getYPrecision
ANativeActivity_finish
ANativeActivity_hideSoftInput
ANativeActivity_setWindowFlags
ANativeActivity_setWindowFormat
ANativeActivity_showSoftInput
ANativeWindow_acquire
ANativeWindow_fromSurface
ANativeWindow_getFormat
ANativeWindow_getHeight
ANativeWindow_getWidth
ANativeWindow_lock
ANativeWindow_release
ANativeWindow_setBuffersGeometry
ANativeWindow_unlockAndPost
AObbInfo_delete
AObbInfo_getFlags
AObbInfo_getPackageName
AObbInfo_getVersion
AObbScanner_getObbInfo
ASensorEventQueue_disableSensor
ASensorEventQueue_enableSensor
ASensorEventQueue_getEvents
ASensorEventQueue_hasEvents
ASensorEventQueue_setEventRate
ASensorManager_createEventQueue
ASensorManager_destroyEventQueue
ASensorManager_getDefaultSensor
ASensorManager_getInstance
ASensorManager_getSensorList
ASensor_getMinDelay
ASensor_getName
ASensor_getResolution
ASensor_getType
ASensor_getVendor
AStorageManager_delete
AStorageManager_getMountedObbPath
AStorageManager_isObbMounted
AStorageManager_mountObb
AStorageManager_new
AStorageManager_unmountObb

View File

@@ -229,14 +229,6 @@ struct android_native_buffer_t;
#define EGL_NATIVE_BUFFER_ANDROID 0x3140 /* eglCreateImageKHR target */
#endif
#ifndef EGL_ANDROID_get_render_buffer
#define EGL_ANDROID_get_render_buffer 1
#ifdef EGL_EGLEXT_PROTOTYPES
EGLAPI EGLClientBuffer EGLAPIENTRY eglGetRenderBufferANDROID(EGLDisplay dpy, EGLSurface draw);
#endif
typedef EGLClientBuffer (EGLAPIENTRYP PFNEGLGETRENDERBUFFERANDROIDPROC) (EGLDisplay dpy, EGLSurface draw);
#endif
#ifndef EGL_ANDROID_swap_rectangle
#define EGL_ANDROID_swap_rectangle 1
#ifdef EGL_EGLEXT_PROTOTYPES

View File

@@ -78,18 +78,7 @@ typedef int EGLNativeDisplayType;
typedef void *EGLNativeWindowType;
typedef void *EGLNativePixmapType;
#elif defined(__unix__) && !defined(__ANDROID__)
/* X11 (tentative) */
#include <X11/Xlib.h>
#include <X11/Xutil.h>
typedef Display *EGLNativeDisplayType;
typedef Pixmap EGLNativePixmapType;
typedef Window EGLNativeWindowType;
#elif defined(__ANDROID__)
#elif defined(__ANDROID__) || defined(ANDROID)
#include <android/native_window.h>
@@ -99,6 +88,16 @@ typedef struct ANativeWindow* EGLNativeWindowType;
typedef struct egl_native_pixmap_t* EGLNativePixmapType;
typedef void* EGLNativeDisplayType;
#elif defined(__unix__)
/* X11 (tentative) */
#include <X11/Xlib.h>
#include <X11/Xutil.h>
typedef Display *EGLNativeDisplayType;
typedef Pixmap EGLNativePixmapType;
typedef Window EGLNativeWindowType;
#else
#error "Platform not recognized"
#endif

View File

@@ -18,9 +18,9 @@
#ifndef ANDROID_ASSET_MANAGER_H
#define ANDROID_ASSET_MANAGER_H
#include <sys/cdefs.h>
__BEGIN_DECLS
#ifdef __cplusplus
extern "C" {
#endif
struct AAssetManager;
typedef struct AAssetManager AAssetManager;
@@ -130,6 +130,9 @@ int AAsset_openFileDescriptor(AAsset* asset, off_t* outStart, off_t* outLength);
int AAsset_isAllocated(AAsset* asset);
__END_DECLS
#endif /* ANDROID_ASSET_MANAGER_H */
#ifdef __cplusplus
};
#endif
#endif // ANDROID_ASSET_MANAGER_H

View File

@@ -21,7 +21,9 @@
#include <android/asset_manager.h>
#include <jni.h>
__BEGIN_DECLS
#ifdef __cplusplus
extern "C" {
#endif
/**
* Given a Dalvik AssetManager object, obtain the corresponding native AAssetManager
@@ -31,6 +33,8 @@ __BEGIN_DECLS
*/
AAssetManager* AAssetManager_fromJava(JNIEnv* env, jobject assetManager);
__END_DECLS
#ifdef __cplusplus
};
#endif
#endif /* ANDROID_ASSET_MANAGER_JNI_H */
#endif // ANDROID_ASSET_MANAGER_JNI_H

View File

@@ -19,7 +19,9 @@
#include <android/asset_manager.h>
__BEGIN_DECLS
#ifdef __cplusplus
extern "C" {
#endif
struct AConfiguration;
typedef struct AConfiguration AConfiguration;
@@ -310,6 +312,8 @@ int32_t AConfiguration_match(AConfiguration* base, AConfiguration* requested);
int32_t AConfiguration_isBetterThan(AConfiguration* base, AConfiguration* test,
AConfiguration* requested);
__END_DECLS
#ifdef __cplusplus
};
#endif
#endif /* ANDROID_CONFIGURATION_H */
#endif // ANDROID_CONFIGURATION_H

View File

@@ -45,7 +45,9 @@
#include <android/keycodes.h>
#include <android/looper.h>
__BEGIN_DECLS
#ifdef __cplusplus
extern "C" {
#endif
/*
* Key states (may be returned by queries about the current state of a
@@ -304,6 +306,8 @@ enum {
AINPUT_SOURCE_MOUSE = 0x00002000 | AINPUT_SOURCE_CLASS_POINTER,
AINPUT_SOURCE_TRACKBALL = 0x00010000 | AINPUT_SOURCE_CLASS_NAVIGATION,
AINPUT_SOURCE_TOUCHPAD = 0x00100000 | AINPUT_SOURCE_CLASS_POSITION,
AINPUT_SOURCE_ANY = 0xffffff00,
};
/*
@@ -675,6 +679,8 @@ int32_t AInputQueue_preDispatchEvent(AInputQueue* queue, AInputEvent* event);
*/
void AInputQueue_finishEvent(AInputQueue* queue, AInputEvent* event, int handled);
__END_DECLS
#ifdef __cplusplus
}
#endif
#endif /* _ANDROID_INPUT_H */
#endif // _ANDROID_INPUT_H

View File

@@ -33,10 +33,11 @@
* - DO NOT CHANGE THE LAYOUT OR SIZE OF STRUCTURES
*/
#include <sys/cdefs.h>
#include <sys/types.h>
__BEGIN_DECLS
#ifdef __cplusplus
extern "C" {
#endif
/*
* Key codes.
@@ -158,6 +159,8 @@ enum {
// Refer to frameworks/base/core/java/android/view/KeyEvent.java for the full list.
};
__END_DECLS
#ifdef __cplusplus
}
#endif
#endif /* _ANDROID_KEYCODES_H */
#endif // _ANDROID_KEYCODES_H

View File

@@ -18,9 +18,9 @@
#ifndef ANDROID_LOOPER_H
#define ANDROID_LOOPER_H
#include <sys/cdefs.h>
__BEGIN_DECLS
#ifdef __cplusplus
extern "C" {
#endif
/**
* ALooper
@@ -248,6 +248,8 @@ int ALooper_addFd(ALooper* looper, int fd, int ident, int events,
*/
int ALooper_removeFd(ALooper* looper, int fd);
__END_DECLS
#ifdef __cplusplus
};
#endif
#endif /* ANDROID_NATIVE_WINDOW_H */
#endif // ANDROID_NATIVE_WINDOW_H

View File

@@ -19,7 +19,6 @@
#define ANDROID_NATIVE_ACTIVITY_H
#include <stdint.h>
#include <sys/cdefs.h>
#include <sys/types.h>
#include <jni.h>
@@ -28,7 +27,9 @@
#include <android/input.h>
#include <android/native_window.h>
__BEGIN_DECLS
#ifdef __cplusplus
extern "C" {
#endif
struct ANativeActivityCallbacks;
@@ -287,6 +288,9 @@ enum {
*/
void ANativeActivity_hideSoftInput(ANativeActivity* activity, uint32_t flags);
__END_DECLS
#ifdef __cplusplus
};
#endif
#endif // ANDROID_NATIVE_ACTIVITY_H
#endif /* ANDROID_NATIVE_ACTIVITY_H */

View File

@@ -17,10 +17,11 @@
#ifndef ANDROID_NATIVE_WINDOW_H
#define ANDROID_NATIVE_WINDOW_H
#include <sys/cdefs.h>
#include <android/rect.h>
__BEGIN_DECLS
#ifdef __cplusplus
extern "C" {
#endif
/*
* Pixel formats that a window can use.
@@ -109,6 +110,8 @@ int32_t ANativeWindow_lock(ANativeWindow* window, ANativeWindow_Buffer* outBuffe
*/
int32_t ANativeWindow_unlockAndPost(ANativeWindow* window);
__END_DECLS
#ifdef __cplusplus
};
#endif
#endif /* ANDROID_NATIVE_WINDOW_H */
#endif // ANDROID_NATIVE_WINDOW_H

View File

@@ -21,7 +21,9 @@
#include <jni.h>
__BEGIN_DECLS
#ifdef __cplusplus
extern "C" {
#endif
/**
* Return the ANativeWindow associated with a Java Surface object,
@@ -31,6 +33,8 @@ __BEGIN_DECLS
*/
ANativeWindow* ANativeWindow_fromSurface(JNIEnv* env, jobject surface);
__END_DECLS
#ifdef __cplusplus
};
#endif
#endif /* ANDROID_NATIVE_WINDOW_H */
#endif // ANDROID_NATIVE_WINDOW_H

View File

@@ -18,10 +18,11 @@
#ifndef ANDROID_OBB_H
#define ANDROID_OBB_H
#include <sys/cdefs.h>
#include <sys/types.h>
__BEGIN_DECLS
#ifdef __cplusplus
extern "C" {
#endif
struct AObbInfo;
typedef struct AObbInfo AObbInfo;
@@ -55,6 +56,8 @@ int32_t AObbInfo_getVersion(AObbInfo* obbInfo);
*/
int32_t AObbInfo_getFlags(AObbInfo* obbInfo);
__END_DECLS
#ifdef __cplusplus
};
#endif
#endif /* ANDROID_OBB_H */
#endif // ANDROID_OBB_H

View File

@@ -18,9 +18,9 @@
#ifndef ANDROID_RECT_H
#define ANDROID_RECT_H
#include <sys/cdefs.h>
__BEGIN_DECLS
#ifdef __cplusplus
extern "C" {
#endif
typedef struct ARect {
int32_t left;
@@ -29,6 +29,8 @@ typedef struct ARect {
int32_t bottom;
} ARect;
__END_DECLS
#ifdef __cplusplus
};
#endif
#endif /* ANDROID_RECT_H */
#endif // ANDROID_RECT_H

View File

@@ -39,12 +39,14 @@
* native code.
*
*/
#include <sys/cdefs.h>
#include <sys/types.h>
#include <android/looper.h>
__BEGIN_DECLS
#ifdef __cplusplus
extern "C" {
#endif
/*
@@ -247,6 +249,8 @@ float ASensor_getResolution(ASensor const* sensor);
int ASensor_getMinDelay(ASensor const* sensor);
__END_DECLS
#ifdef __cplusplus
};
#endif
#endif /* ANDROID_SENSOR_H */
#endif // ANDROID_SENSOR_H

View File

@@ -18,10 +18,11 @@
#ifndef ANDROID_STORAGE_MANAGER_H
#define ANDROID_STORAGE_MANAGER_H
#include <sys/cdefs.h>
#include <stdint.h>
__BEGIN_DECLS
#ifdef __cplusplus
extern "C" {
#endif
struct AStorageManager;
typedef struct AStorageManager AStorageManager;
@@ -119,6 +120,8 @@ int AStorageManager_isObbMounted(AStorageManager* mgr, const char* filename);
const char* AStorageManager_getMountedObbPath(AStorageManager* mgr, const char* filename);
__END_DECLS
#ifdef __cplusplus
};
#endif
#endif /* ANDROID_STORAGE_MANAGER_H */
#endif // ANDROID_STORAGE_MANAGER_H

View File

@@ -18,9 +18,9 @@
#ifndef ANDROID_WINDOW_H
#define ANDROID_WINDOW_H
#include <sys/cdefs.h>
__BEGIN_DECLS
#ifdef __cplusplus
extern "C" {
#endif
/**
* Window flags, as per the Java API at android.view.WindowManager.LayoutParams.
@@ -51,6 +51,8 @@ enum {
AWINDOW_FLAG_DISMISS_KEYGUARD = 0x00400000,
};
__END_DECLS
#ifdef __cplusplus
};
#endif
#endif /* ANDROID_WINDOW_H */
#endif // ANDROID_WINDOW_H