From bc1d78daa463572c5a770cdca858a3b51d8e1b7b Mon Sep 17 00:00:00 2001 From: Igor Murashkin Date: Thu, 30 Jul 2015 16:39:45 -0700 Subject: runtime: cleanup class_linker out-parameters and formatting * Use out instead of parameters * Fixes up some other signatures to be more correct * Reformat parameters to be one per line if they can't fit on one line * Reformat locks to be one per line if they can't fit on the decl line Change-Id: Ib71b08707d3ed0bb85299406c0b23a1de4e92a1c --- runtime/native/dalvik_system_DexFile.cc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'runtime/native/dalvik_system_DexFile.cc') diff --git a/runtime/native/dalvik_system_DexFile.cc b/runtime/native/dalvik_system_DexFile.cc index 4f97d20d6c..1b210bb4c3 100644 --- a/runtime/native/dalvik_system_DexFile.cc +++ b/runtime/native/dalvik_system_DexFile.cc @@ -17,6 +17,7 @@ #include "dalvik_system_DexFile.h" #include "base/logging.h" +#include "base/out.h" #include "base/stl_util.h" #include "base/stringprintf.h" #include "class_linker.h" @@ -164,7 +165,8 @@ static jobject DexFile_openDexFileNative( std::vector> dex_files; std::vector error_msgs; - dex_files = linker->OpenDexFilesFromOat(sourceName.c_str(), outputName.c_str(), &error_msgs); + dex_files = + linker->OpenDexFilesFromOat(sourceName.c_str(), outputName.c_str(), outof(error_msgs)); if (!dex_files.empty()) { jlongArray array = ConvertNativeToJavaArray(env, dex_files); -- cgit v1.2.3-59-g8ed1b