am 3589326b: am 284e3ae1: Merge "NDK access to the Asset Manager" into gingerbread

Merge commit '3589326ba70415180245e2d6845f6281458ba04a'

* commit '3589326ba70415180245e2d6845f6281458ba04a':
  NDK access to the Asset Manager
This commit is contained in:
Christopher Tate
2010-07-15 23:05:07 -07:00
committed by Android Git Automerger

View File

@@ -23,6 +23,7 @@
#include <jni.h> #include <jni.h>
#include <android/asset_manager.h>
#include <android/input.h> #include <android/input.h>
#include <android/native_window.h> #include <android/native_window.h>
@@ -72,7 +73,7 @@ typedef struct ANativeActivity {
* Path to this application's external (removable/mountable) data directory. * Path to this application's external (removable/mountable) data directory.
*/ */
const char* externalDataPath; const char* externalDataPath;
/** /**
* The platform's SDK version code. * The platform's SDK version code.
*/ */
@@ -84,6 +85,12 @@ typedef struct ANativeActivity {
* state. * state.
*/ */
void* instance; void* instance;
/**
* Pointer to the Asset Manager instance for the application. The application
* uses this to access binary assets bundled inside its own .apk file.
*/
AAssetManager* assetManager;
} ANativeActivity; } ANativeActivity;
/** /**