diff options
| author | Kenny Root <kroot@google.com> | 2010-11-24 12:56:06 -0800 |
|---|---|---|
| committer | Kenny Root <kroot@google.com> | 2010-12-08 11:21:30 -0800 |
| commit | ddb76c4644756b31be948d70aaa8ee541dd94999 (patch) | |
| tree | 782d260d2da982941148be7c1a0a0780749cdfdc /core/jni/android_util_AssetManager.cpp | |
| parent | 8028a951c3aa74990907efb9376d1093d84084af (diff) | |
| download | frameworks_base-ddb76c4644756b31be948d70aaa8ee541dd94999.zip frameworks_base-ddb76c4644756b31be948d70aaa8ee541dd94999.tar.gz frameworks_base-ddb76c4644756b31be948d70aaa8ee541dd94999.tar.bz2 | |
Change assets to use 64-bit API
The asset system and supporting libraries were using off_t instead of
off64_t to access files larger than 2GB (32-bit signed). This change
replaces all off_t with off64_t and lseek64.
There is a new utils/Compat.h added for Mac OS compatibility.
Also fixed some size-related compiler warnings.
Bug: 3205336
Change-Id: I9097b3cb7a602e811fe52f245939d8975da55e9e
Diffstat (limited to 'core/jni/android_util_AssetManager.cpp')
| -rw-r--r-- | core/jni/android_util_AssetManager.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/jni/android_util_AssetManager.cpp b/core/jni/android_util_AssetManager.cpp index 2528db1..619a293 100644 --- a/core/jni/android_util_AssetManager.cpp +++ b/core/jni/android_util_AssetManager.cpp @@ -149,7 +149,7 @@ static jint android_content_AssetManager_openAsset(JNIEnv* env, jobject clazz, static jobject returnParcelFileDescriptor(JNIEnv* env, Asset* a, jlongArray outOffsets) { - off_t startOffset, length; + off64_t startOffset, length; int fd = a->openFileDescriptor(&startOffset, &length); delete a; |