Update from chromium https://crrev.com/302282

base/android/linker/linker_jni.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // This is the Android-specific Chromium linker, a tiny shared library
 // implementing a custom dynamic linker that can be used to load the
 // real Chromium libraries (e.g. libcontentshell.so).
 
 // The main point of this linker is to be able to share the RELRO
 // section of libcontentshell.so (or equivalent) between the browser and
@@ skipping 566 matching lines @@
 }
 
 // Check whether the device supports loading a library directly from the APK
 // file.
 //
 // |env| is the current JNI environment handle.
 // |clazz| is the static class handle which is not used here.
 // |apkfile_name| is the filename of the APK.
 // Returns true if supported.
 jboolean CheckLibraryLoadFromApkSupport(JNIEnv* env, jclass clazz,
-                                          jstring apkfile_name) {
+                                        jstring apkfile_name) {
   String apkfile_name_str(env, apkfile_name);
   const char* apkfile_name_c_str = apkfile_name_str.c_str();
 
   int fd = open(apkfile_name_c_str, O_RDONLY);
   if (fd == -1) {
     LOG_ERROR("%s: Failed to open %s\n", __FUNCTION__, apkfile_name_c_str);
     return false;
   }
 
   LOG_INFO(
       "%s: Memory mapping the first page of %s with executable permissions\n",
       __FUNCTION__, apkfile_name_c_str);
   void* address = mmap(NULL, PAGE_SIZE, PROT_EXEC, MAP_PRIVATE, fd, 0);
 
   jboolean status;
   if (address == MAP_FAILED) {
     status = false;
   } else {
     status = true;
     munmap(address, PAGE_SIZE);
   }
 
   close(fd);
 
   LOG_INFO("%s: %s\n", __FUNCTION__, status ? "Supported" : "NOT supported");
   return status;
 }
 
+// Check whether a library is page aligned in the APK file.
+//
+// |env| is the current JNI environment handle.
+// |clazz| is the static class handle which is not used here.
+// |apkfile_name| is the filename of the APK.
+// |library_name| is the library base name.
+// Returns true if page aligned.
+jboolean CheckLibraryAlignedInApk(JNIEnv* env, jclass clazz,
+                                  jstring apkfile_name, jstring library_name) {
+  String apkfile_name_str(env, apkfile_name);
+  const char* apkfile_name_c_str = apkfile_name_str.c_str();
+  String library_name_str(env, library_name);
+  const char* library_name_c_str = library_name_str.c_str();
+
+  LOG_INFO("%s: Checking if %s is page-aligned in %s\n", __FUNCTION__,
+           library_name_c_str, apkfile_name_c_str);
+  jboolean aligned = crazy_linker_check_library_aligned_in_zip_file(
+      apkfile_name_c_str, library_name_c_str) == CRAZY_STATUS_SUCCESS;
+  LOG_INFO("%s: %s\n", __FUNCTION__, aligned ? "Aligned" : "NOT aligned");
+
+  return aligned;
+}
+
 const JNINativeMethod kNativeMethods[] = {
     {"nativeLoadLibrary",
      "("
      "Ljava/lang/String;"
      "J"
      "Lorg/chromium/base/library_loader/Linker$LibInfo;"
      ")"
      "Z",
      reinterpret_cast<void*>(&LoadLibrary)},
     {"nativeLoadLibraryInZipFile",
@@ skipping 35 matching lines @@
      "("
      "J"
      ")"
      "J",
      reinterpret_cast<void*>(&GetRandomBaseLoadAddress)},
      {"nativeCheckLibraryLoadFromApkSupport",
       "("
       "Ljava/lang/String;"
       ")"
       "Z",
-      reinterpret_cast<void*>(&CheckLibraryLoadFromApkSupport)}, };
+      reinterpret_cast<void*>(&CheckLibraryLoadFromApkSupport)},
+     {"nativeCheckLibraryAlignedInApk",
+      "("
+      "Ljava/lang/String;"
+      "Ljava/lang/String;"
+      ")"
+      "Z",
+      reinterpret_cast<void*>(&CheckLibraryAlignedInApk)}, };
 
 }  // namespace
 
 // JNI_OnLoad() hook called when the linker library is loaded through
 // the regular System.LoadLibrary) API. This shall save the Java VM
 // handle and initialize LibInfo fields.
 jint JNI_OnLoad(JavaVM* vm, void* reserved) {
   LOG_INFO("%s: Entering", __FUNCTION__);
   // Get new JNIEnv
   JNIEnv* env;
@@ skipping 30 matching lines @@
   crazy_context_t* context = GetCrazyContext();
   crazy_context_set_java_vm(context, vm, JNI_VERSION_1_4);
 
   // Register the function that the crazy linker can call to post code
   // for later execution.
   crazy_context_set_callback_poster(context, &PostForLaterExecution, NULL);
 
   LOG_INFO("%s: Done", __FUNCTION__);
   return JNI_VERSION_1_4;
 }