diff options
| author | Adam Lesinski <adamlesinski@google.com> | 2017-01-23 12:58:11 -0800 |
|---|---|---|
| committer | Adam Lesinski <adamlesinski@google.com> | 2018-01-24 15:19:04 -0800 |
| commit | dcb3c6559b09ec89771858ec27a787027da9af50 (patch) | |
| tree | 83aeb141e483ec7d059b7089e00b761ace122662 /core/jni/include | |
| parent | 262cdf0f2724aaeade73a6c9e7b7466e0adf1007 (diff) | |
Replace AssetManager with AssetManager2 implementation
Test: atest CtsContentTestCases:android.content.res.cts
Test: make libandroidfw_tests
Change-Id: I572eb13c6a4372c7f656f5912821cececd5bf3d4
Diffstat (limited to 'core/jni/include')
| -rw-r--r-- | core/jni/include/android_runtime/android_util_AssetManager.h | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/core/jni/include/android_runtime/android_util_AssetManager.h b/core/jni/include/android_runtime/android_util_AssetManager.h index 8dd933707a6a..2c1e3579eb92 100644 --- a/core/jni/include/android_runtime/android_util_AssetManager.h +++ b/core/jni/include/android_runtime/android_util_AssetManager.h @@ -14,17 +14,20 @@ * limitations under the License. */ -#ifndef android_util_AssetManager_H -#define android_util_AssetManager_H +#ifndef ANDROID_RUNTIME_ASSETMANAGER_H +#define ANDROID_RUNTIME_ASSETMANAGER_H -#include <androidfw/AssetManager.h> +#include "androidfw/AssetManager2.h" +#include "androidfw/MutexGuard.h" #include "jni.h" namespace android { -extern AssetManager* assetManagerForJavaObject(JNIEnv* env, jobject assetMgr); +extern AAssetManager* NdkAssetManagerForJavaObject(JNIEnv* env, jobject jassetmanager); +extern Guarded<AssetManager2>* AssetManagerForJavaObject(JNIEnv* env, jobject jassetmanager); +extern Guarded<AssetManager2>* AssetManagerForNdkAssetManager(AAssetManager* assetmanager); -} +} // namespace android -#endif +#endif // ANDROID_RUNTIME_ASSETMANAGER_H |