From b190d945459253c329062dab2440671828275767 Mon Sep 17 00:00:00 2001 From: Mathieu Chartier Date: Thu, 12 Nov 2015 10:00:58 -0800 Subject: [PATCH] Add class loader argument to openDexFileNative Bug: 22858531 Change-Id: I315919d91822db0c73cf16b21d660d5870d5746f --- runtime/native/dalvik_system_DexFile.cc | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/runtime/native/dalvik_system_DexFile.cc b/runtime/native/dalvik_system_DexFile.cc index 8b2f4d8d2..e85434ee6 100644 --- a/runtime/native/dalvik_system_DexFile.cc +++ b/runtime/native/dalvik_system_DexFile.cc @@ -149,8 +149,13 @@ class NullableScopedUtfChars { void operator=(const NullableScopedUtfChars&); }; -static jobject DexFile_openDexFileNative( - JNIEnv* env, jclass, jstring javaSourceName, jstring javaOutputName, jint) { +static jobject DexFile_openDexFileNative(JNIEnv* env, + jclass, + jstring javaSourceName, + jstring javaOutputName, + jint flags ATTRIBUTE_UNUSED, + // class_loader will be used for app images. + jobject class_loader ATTRIBUTE_UNUSED) { ScopedUtfChars sourceName(env, javaSourceName); if (sourceName.c_str() == nullptr) { return 0; @@ -441,7 +446,7 @@ static JNINativeMethod gMethods[] = { NATIVE_METHOD(DexFile, getDexOptNeeded, "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Z)I"), NATIVE_METHOD(DexFile, openDexFileNative, - "(Ljava/lang/String;Ljava/lang/String;I)Ljava/lang/Object;"), + "(Ljava/lang/String;Ljava/lang/String;ILjava/lang/ClassLoader;)Ljava/lang/Object;"), }; void register_dalvik_system_DexFile(JNIEnv* env) { -- 2.11.0