diff options
| author | 2015-12-11 15:11:48 -0800 | |
|---|---|---|
| committer | 2015-12-11 15:11:48 -0800 | |
| commit | b310d711e6790d67650faf43d87494d6dfbaba07 (patch) | |
| tree | 8dce647eac1423d9dd344c2a7e1d88f1c9b33c64 | |
| parent | 96857412866e5cfbd7bc12f520f4495cdf99e0a8 (diff) | |
| parent | 846efa942a32a5615227660594ad287d48f03a26 (diff) | |
Merge "Fix call to LoadNativeLibrary" am: 2cab58141a
am: 846efa942a
* commit '846efa942a32a5615227660594ad287d48f03a26':
Fix call to LoadNativeLibrary
| -rw-r--r-- | compiler/jni/jni_compiler_test.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/compiler/jni/jni_compiler_test.cc b/compiler/jni/jni_compiler_test.cc index cf836a9c9f..5ab55e0614 100644 --- a/compiler/jni/jni_compiler_test.cc +++ b/compiler/jni/jni_compiler_test.cc @@ -220,7 +220,7 @@ void JniCompilerTest::CompileAndRunIntMethodThroughStubImpl() { std::string reason; ASSERT_TRUE(Runtime::Current()->GetJavaVM()-> - LoadNativeLibrary(env_, "", class_loader_, nullptr, &reason)) + LoadNativeLibrary(env_, "", class_loader_, nullptr, nullptr, &reason)) << reason; jint result = env_->CallNonvirtualIntMethod(jobj_, jklass_, jmethod_, 24); @@ -235,7 +235,7 @@ void JniCompilerTest::CompileAndRunStaticIntMethodThroughStubImpl() { std::string reason; ASSERT_TRUE(Runtime::Current()->GetJavaVM()-> - LoadNativeLibrary(env_, "", class_loader_, nullptr, &reason)) + LoadNativeLibrary(env_, "", class_loader_, nullptr, nullptr, &reason)) << reason; jint result = env_->CallStaticIntMethod(jklass_, jmethod_, 42); |