diff options
| author | Christopher Tate <ctate@google.com> | 2010-07-15 23:05:27 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-07-15 23:05:27 -0700 |
| commit | 6ba776ad34a8029e4d0c784ce0092f1fcbc91bef (patch) | |
| tree | 8df9196a58f89c0f05b49e3588bc08481a1ee198 /include | |
| parent | 085d0f55e6a2e8449961174673d43a5868874639 (diff) | |
| parent | 078ccbdbb98c118aa87cab2fef61ff90dd128358 (diff) | |
| download | frameworks_base-6ba776ad34a8029e4d0c784ce0092f1fcbc91bef.zip frameworks_base-6ba776ad34a8029e4d0c784ce0092f1fcbc91bef.tar.gz frameworks_base-6ba776ad34a8029e4d0c784ce0092f1fcbc91bef.tar.bz2 | |
am 078ccbdb: am 2c40582a: Merge "Add native C APIs for working with the Asset Manager" into gingerbread
Merge commit '078ccbdbb98c118aa87cab2fef61ff90dd128358'
* commit '078ccbdbb98c118aa87cab2fef61ff90dd128358':
Add native C APIs for working with the Asset Manager
Diffstat (limited to 'include')
| -rw-r--r-- | include/utils/AssetManager.h | 20 |
1 files changed, 19 insertions, 1 deletions
diff --git a/include/utils/AssetManager.h b/include/utils/AssetManager.h index d8994e0..97694ff 100644 --- a/include/utils/AssetManager.h +++ b/include/utils/AssetManager.h @@ -29,6 +29,24 @@ #include <utils/ZipFileRO.h> #include <utils/threads.h> +/* + * Native-app access is via the opaque typedef struct AAssetManager in the C namespace. + */ +#ifdef __cplusplus +extern "C" { +#endif + +struct AAssetManager { }; + +#ifdef __cplusplus +}; +#endif + + +/* + * Now the proper C++ android-namespace definitions + */ + namespace android { class Asset; // fwd decl for things that include Asset.h first @@ -48,7 +66,7 @@ struct ResTable_config; * The asset hierarchy may be examined like a filesystem, using * AssetDir objects to peruse a single directory. */ -class AssetManager { +class AssetManager : public AAssetManager { public: typedef enum CacheMode { CACHE_UNKNOWN = 0, |