summaryrefslogtreecommitdiff
path: root/compiler/jni/jni_compiler_test.cc
diff options
context:
space:
mode:
author Dimitry Ivanov <dimitry@google.com> 2015-12-11 12:37:43 -0800
committer android-build-merger <android-build-merger@google.com> 2015-12-11 12:37:43 -0800
commit1b6dd57975aefbb28d66f0e58ecdf4abe56648b4 (patch)
treeed8a1ce97cca924207da598fe7333c4ae7083f77 /compiler/jni/jni_compiler_test.cc
parent4b273683dcc6087e70e1e4f98867c55aebed6f61 (diff)
parent98d46d2d287c8081995517770392a21b4d59d2e9 (diff)
Merge "Use isolated namespaces for app native libs"
am: 98d46d2d28 * commit '98d46d2d287c8081995517770392a21b4d59d2e9': Use isolated namespaces for app native libs
Diffstat (limited to 'compiler/jni/jni_compiler_test.cc')
-rw-r--r--compiler/jni/jni_compiler_test.cc6
1 files changed, 4 insertions, 2 deletions
diff --git a/compiler/jni/jni_compiler_test.cc b/compiler/jni/jni_compiler_test.cc
index f3bda2fa72..cf836a9c9f 100644
--- a/compiler/jni/jni_compiler_test.cc
+++ b/compiler/jni/jni_compiler_test.cc
@@ -219,7 +219,8 @@ void JniCompilerTest::CompileAndRunIntMethodThroughStubImpl() {
// calling through stub will link with &Java_MyClassNatives_bar
std::string reason;
- ASSERT_TRUE(Runtime::Current()->GetJavaVM()->LoadNativeLibrary(env_, "", class_loader_, &reason))
+ ASSERT_TRUE(Runtime::Current()->GetJavaVM()->
+ LoadNativeLibrary(env_, "", class_loader_, nullptr, &reason))
<< reason;
jint result = env_->CallNonvirtualIntMethod(jobj_, jklass_, jmethod_, 24);
@@ -233,7 +234,8 @@ void JniCompilerTest::CompileAndRunStaticIntMethodThroughStubImpl() {
// calling through stub will link with &Java_MyClassNatives_sbar
std::string reason;
- ASSERT_TRUE(Runtime::Current()->GetJavaVM()->LoadNativeLibrary(env_, "", class_loader_, &reason))
+ ASSERT_TRUE(Runtime::Current()->GetJavaVM()->
+ LoadNativeLibrary(env_, "", class_loader_, nullptr, &reason))
<< reason;
jint result = env_->CallStaticIntMethod(jklass_, jmethod_, 42);