diff options
| author | 2014-05-19 16:49:03 -0700 | |
|---|---|---|
| committer | 2014-05-19 22:27:39 -0700 | |
| commit | 700a402244a1a423da4f3ba8032459f4b65fa18f (patch) | |
| tree | 4c22fcda04d271bd55a37aff30650214af17a90c /runtime/native/dalvik_system_DexFile.cc | |
| parent | 047c11adcbcbc0bcf210defdfcbada763961ffee (diff) | |
Now we have a proper C++ library, use std::unique_ptr.
Also remove the Android.libcxx.mk and other bits of stlport compatibility
mechanics.
Change-Id: Icdf7188ba3c79cdf5617672c1cfd0a68ae596a61
Diffstat (limited to 'runtime/native/dalvik_system_DexFile.cc')
| -rw-r--r-- | runtime/native/dalvik_system_DexFile.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/runtime/native/dalvik_system_DexFile.cc b/runtime/native/dalvik_system_DexFile.cc index 27f19a78c7..9f9d82b919 100644 --- a/runtime/native/dalvik_system_DexFile.cc +++ b/runtime/native/dalvik_system_DexFile.cc @@ -391,7 +391,7 @@ static jboolean IsDexOptNeededInternal(JNIEnv* env, const char* filename, // Check if we have an odex file next to the dex file. std::string odex_filename(DexFilenameToOdexFilename(filename, kRuntimeISA)); std::string error_msg; - UniquePtr<const OatFile> oat_file(OatFile::Open(odex_filename, odex_filename, NULL, false, + std::unique_ptr<const OatFile> oat_file(OatFile::Open(odex_filename, odex_filename, NULL, false, &error_msg)); if (oat_file.get() == nullptr) { if (kVerboseLogging) { |