diff options
| author | Christopher Tate <ctate@google.com> | 2010-07-15 15:00:14 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-07-15 15:00:14 -0700 |
| commit | 2c40582a6c3a5781b39d0504d5aa8934982989d2 (patch) | |
| tree | 07900e7d1a829a8465ad27380e24dacaeb1b1345 /include | |
| parent | 42ef0c715da879a9878b7bf4eb9c90b21e4ab8ae (diff) | |
| parent | 6cce32b6adbb3a9725fc730ba0e0068a74657e60 (diff) | |
| download | frameworks_base-2c40582a6c3a5781b39d0504d5aa8934982989d2.zip frameworks_base-2c40582a6c3a5781b39d0504d5aa8934982989d2.tar.gz frameworks_base-2c40582a6c3a5781b39d0504d5aa8934982989d2.tar.bz2 | |
Merge "Add native C APIs for working with the Asset Manager" into gingerbread
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, |