summaryrefslogtreecommitdiff
path: root/compiler
diff options
context:
space:
mode:
author Nicolas Geoffray <ngeoffray@google.com> 2019-01-20 13:58:49 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 2019-01-20 13:58:49 +0000
commited9e0c9a5462bbb805000cb9483e334cda867b48 (patch)
tree844f0b508afd822d42bfae7c79afddb23eb5bdae /compiler
parente0c33a29811343e634b7445b7c0aac3c9a6a8f73 (diff)
parent96259f1f2f37d222ce321fd223655d1134a8ba01 (diff)
Merge "Pass the Java caller's location to OpenNativeLibrary."
Diffstat (limited to 'compiler')
-rw-r--r--compiler/jni/jni_compiler_test.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/compiler/jni/jni_compiler_test.cc b/compiler/jni/jni_compiler_test.cc
index 3c683898e6..ce987c1f35 100644
--- a/compiler/jni/jni_compiler_test.cc
+++ b/compiler/jni/jni_compiler_test.cc
@@ -659,7 +659,7 @@ void JniCompilerTest::CompileAndRunIntMethodThroughStubImpl() {
std::string reason;
ASSERT_TRUE(Runtime::Current()->GetJavaVM()->
- LoadNativeLibrary(env_, "", class_loader_, &reason))
+ LoadNativeLibrary(env_, "", class_loader_, nullptr, &reason))
<< reason;
jint result = env_->CallNonvirtualIntMethod(jobj_, jklass_, jmethod_, 24);
@@ -675,7 +675,7 @@ void JniCompilerTest::CompileAndRunStaticIntMethodThroughStubImpl() {
std::string reason;
ASSERT_TRUE(Runtime::Current()->GetJavaVM()->
- LoadNativeLibrary(env_, "", class_loader_, &reason))
+ LoadNativeLibrary(env_, "", class_loader_, nullptr, &reason))
<< reason;
jint result = env_->CallStaticIntMethod(jklass_, jmethod_, 42);