summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Elliott Hughes <enh@google.com> 2014-01-17 18:36:02 -0800
committer Android Git Automerger <android-git-automerger@android.com> 2014-01-17 18:36:02 -0800
commitaa80f1a3caf6271f1c48a779e260811f2802a9f0 (patch)
tree022aca9d91c4d539b6161bb2280277dad57c6b16
parent66b5a2b25bbe9844fc538e383922a0866c0baec0 (diff)
parentc9a60b0f77525244ac4f970258703b8dc62ee140 (diff)
am c9a60b0f: Merge "Don\'t confuse stat and stat64."
* commit 'c9a60b0f77525244ac4f970258703b8dc62ee140': Don't confuse stat and stat64.
-rw-r--r--core/jni/com_android_internal_content_NativeLibraryHelper.cpp2
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 00da0f7d9fd1..a86091851aba 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;
}