commit beec08679b7e0cfc10f1ef57072716b17ce417c3
author Gustav Sennton <gsennton@google.com> Wed Jun 21 17:51:27 2017 +0100
committer Gustav Sennton <gsennton@google.com> Mon Jun 26 16:05:33 2017 +0100
tree 566af8a7dbfaba8f21ebe57a6c915060a5868573
parent d9dd77ea6a04ccea47c9366785ec7d7171c5c32a

Use classloader namespace instead of lib paths to load WebView libs.

When loading WebView's native libraries we now have a classloader
pointing to the namespace of thise libraries - so we no longer need to
explicitly reference those libraries by their path names.

Bug: 62860565
Test: Start a WebView-using app. Ensure that libwebviewchromium.so is
loaded into the app process.

Change-Id: I205131f4b5fac7c33374560515b85ddef19a7ce9

native/webview/loader/loader.cpp

diff --git a/native/webview/loader/loader.cpp b/native/webview/loader/loader.cpp
index 565c6b0..376dbb8 100644
--- a/native/webview/loader/loader.cpp
+++ b/native/webview/loader/loader.cpp
@@ -167,16 +167,14 @@
   return ret;
 }
 
-jint LoadWithRelroFile(JNIEnv* env, jclass, jstring lib32, jstring lib64,
-                       jstring relro32, jstring relro64, jobject clazzLoader) {
+jint LoadWithRelroFile(JNIEnv* env, jclass, jstring lib, jstring relro32,
+                       jstring relro64, jobject clazzLoader) {
 #ifdef __LP64__
-  jstring lib = lib64;
   jstring relro = relro64;
-  (void)lib32; (void)relro32;
+  (void)relro32;
 #else
-  jstring lib = lib32;
   jstring relro = relro32;
-  (void)lib64; (void)relro64;
+  (void)relro64;
 #endif
   jint ret = LIBLOAD_FAILED_JNI_CALL;
   const char* lib_utf8 = env->GetStringUTFChars(lib, NULL);
@@ -201,7 +199,7 @@
       "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Z",
       reinterpret_cast<void*>(CreateRelroFile) },
   { "nativeLoadWithRelroFile",
-      "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/ClassLoader;)I",
+      "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/ClassLoader;)I",
       reinterpret_cast<void*>(LoadWithRelroFile) },
 };