commit b9cc1ca34adec5e9254f78e9ee40d57348aa2fd0
author Brian Carlstrom <bdc@google.com> Fri Jan 27 00:57:42 2012 -0800
committer Brian Carlstrom <bdc@google.com> Fri Jan 27 17:27:17 2012 -0800
tree bed33448b7be0223612d31164c20c851a713f543
parent 9b06a0d87757d76b05e5f310ce2b9a5a8c746bdf

Remove need for libarttest.so for gtests for tradefed

Change-Id: I18b39b9fc6f0bfa163ef7e7063864696d6958ad0

src/jni_compiler_test.cc

diff --git a/src/jni_compiler_test.cc b/src/jni_compiler_test.cc
index 938d733..5e19d4d 100644
--- a/src/jni_compiler_test.cc
+++ b/src/jni_compiler_test.cc
@@ -17,6 +17,11 @@
 #include "scoped_jni_thread_state.h"
 #include "thread.h"
 
+extern "C"
+JNIEXPORT jint JNICALL Java_MyClass_bar(JNIEnv* env, jobject thisObj, jint count) {
+  return count + 1;
+}
+
 namespace art {
 
 class JniCompilerTest : public CommonTest {
@@ -109,12 +114,11 @@
 TEST_F(JniCompilerTest, CompileAndRunIntMethodThroughStub) {
   SirtRef<ClassLoader> class_loader(LoadDex("MyClassNatives"));
   SetupForTest(class_loader.get(), false, "bar", "(I)I",
-               NULL /* dlsym will find &Java_MyClass_bar later */);
+               NULL /* calling through stub will load &Java_MyClass_bar */);
 
-  std::string path("libarttest.so");
   std::string reason;
-  ASSERT_TRUE(Runtime::Current()->GetJavaVM()->LoadNativeLibrary(path, class_loader.get(), reason))
-      << path << ": " << reason;
+  ASSERT_TRUE(Runtime::Current()->GetJavaVM()->LoadNativeLibrary("", class_loader.get(), reason))
+      << reason;
 
   jint result = env_->CallNonvirtualIntMethod(jobj_, jklass_, jmethod_, 24);
   EXPECT_EQ(25, result);