diff options
| author | Elliott Hughes <enh@google.com> | 2014-01-18 02:42:01 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-01-18 02:42:01 +0000 |
| commit | 8815d261d9fefbac8f24936dc37a055ab9ced038 (patch) | |
| tree | af0dde55ccc67c70ebdcadea5912a2a5e6e2c0cb /core/jni | |
| parent | 38cf0704f6fbfa6d41d5d10488ce25e645adb835 (diff) | |
| parent | 8da106ebf31d725c00c1910a51f6e1cfb0d8c052 (diff) | |
| download | frameworks_base-8815d261d9fefbac8f24936dc37a055ab9ced038.zip frameworks_base-8815d261d9fefbac8f24936dc37a055ab9ced038.tar.gz frameworks_base-8815d261d9fefbac8f24936dc37a055ab9ced038.tar.bz2 | |
am 8da106eb: am aa80f1a3: am c9a60b0f: Merge "Don\'t confuse stat and stat64."
* commit '8da106ebf31d725c00c1910a51f6e1cfb0d8c052':
Don't confuse stat and stat64.
Diffstat (limited to 'core/jni')
| -rw-r--r-- | core/jni/com_android_internal_content_NativeLibraryHelper.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/jni/com_android_internal_content_NativeLibraryHelper.cpp b/core/jni/com_android_internal_content_NativeLibraryHelper.cpp index 00da0f7..a860918 100644 --- a/core/jni/com_android_internal_content_NativeLibraryHelper.cpp +++ b/core/jni/com_android_internal_content_NativeLibraryHelper.cpp @@ -202,7 +202,7 @@ copyFileIfChanged(JNIEnv *env, void* arg, ZipFileRO* zipFile, ZipEntryRO zipEntr } // Only copy out the native file if it's different. - struct stat st; + struct stat64 st; if (!isFileDifferent(localFileName, uncompLen, modTime, crc, &st)) { return INSTALL_SUCCEEDED; } |