commit 39312ff423cac71675e8050d4f04ec38c6fe30a5
author Elliott Hughes <enh@google.com> Sat Jan 18 02:47:20 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Sat Jan 18 02:47:20 2014 +0000
tree 7bc48587465adc0e428dc2f2ca7cc9e335bd19eb
parent b121ea542a051181e32e8734caf7d4a55127c0ec
parent a850e5ac27662ff2030d6a3d3f1ce1f6cb7c2e44

am a850e5ac: am 8815d261: am 8da106eb: am aa80f1a3: am c9a60b0f: Merge "Don\'t confuse stat and stat64."

* commit 'a850e5ac27662ff2030d6a3d3f1ce1f6cb7c2e44':
  Don't confuse stat and stat64.

core/jni/com_android_internal_content_NativeLibraryHelper.cpp

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 @@
     }
 
     // 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;
     }