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 /native | |
| 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 'native')
| -rw-r--r-- | native/android/asset_manager.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/native/android/asset_manager.cpp b/native/android/asset_manager.cpp index 3f7c1b6..33f088d 100644 --- a/native/android/asset_manager.cpp +++ b/native/android/asset_manager.cpp @@ -201,7 +201,7 @@ off_t AAsset_getRemainingLength(AAsset* asset) int AAsset_openFileDescriptor(AAsset* asset, off_t* outStart, off_t* outLength) { - return asset->mAsset->openFileDescriptor(outStart, outLength); + return asset->mAsset->openFileDescriptor((off64_t*)outStart, (off64_t*)outLength); } int AAsset_isAllocated(AAsset* asset) |