Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2887)

Unified Diff: base/android/java/src/org/chromium/base/library_loader/Linker.java

Issue 1180693002: Update from https://crrev.com/333737 (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: rebased Created 5 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: base/android/java/src/org/chromium/base/library_loader/Linker.java
diff --git a/base/android/java/src/org/chromium/base/library_loader/Linker.java b/base/android/java/src/org/chromium/base/library_loader/Linker.java
index 7e5099875a6d9be9b438c2e117e3ec7bdc2073b3..9a64a3fddbfd3b9837326daa6aaabc9edbdceb22 100644
--- a/base/android/java/src/org/chromium/base/library_loader/Linker.java
+++ b/base/android/java/src/org/chromium/base/library_loader/Linker.java
@@ -798,19 +798,6 @@ public class Linker {
}
/**
- * Enable the fallback due to lack of support for mapping the APK file with
- * executable permission (see crbug.com/398425).
- */
- public static void enableNoMapExecSupportFallback() {
- synchronized (Linker.class) {
- ensureInitializedLocked();
-
- if (DEBUG) Log.i(TAG, "Enabling no map executable support fallback");
- nativeEnableNoMapExecSupportFallback();
- }
- }
-
- /**
* Determine whether a library is the linker library. Also deal with the
* component build that adds a .cr suffix to the name.
*/
@@ -838,26 +825,6 @@ public class Linker {
}
/**
- * Check whether the device supports mapping the APK file with executable permission.
- *
- * @param apkFile Filename of the APK.
- * @return true if supported.
- */
- public static boolean checkMapExecSupport(String apkFile) {
- assert apkFile != null;
-
- synchronized (Linker.class) {
- ensureInitializedLocked();
-
- if (DEBUG) Log.i(TAG, "checkMapExecSupport: " + apkFile);
- boolean supported = nativeCheckMapExecSupport(apkFile);
- if (DEBUG) Log.i(TAG, "Mapping the APK file with executable permission "
- + (supported ? "" : "NOT ") + "supported");
- return supported;
- }
- }
-
- /**
* Check whether a library is page aligned and uncompressed in the APK file.
*
* @param apkFile Filename of the APK.
@@ -927,12 +894,6 @@ public class Linker {
LibInfo libInfo);
/**
- * Native method used to enable the fallback due to lack of support for
- * mapping the APK file with executable permission.
- */
- private static native void nativeEnableNoMapExecSupportFallback();
-
- /**
* Native method used to create a shared RELRO section.
* If the library was already loaded at the same address using
* nativeLoadLibrary(), this creates the RELRO for it. Otherwise,
@@ -988,15 +949,6 @@ public class Linker {
private static native String nativeGetLibraryFilePathInZipFile(String library);
/**
- * Native method which checks whether the device supports mapping the APK file
- * with executable permission.
- *
- * @param apkFile Filename of the APK.
- * @return true if supported.
- */
- private static native boolean nativeCheckMapExecSupport(String apkFile);
-
- /**
* Native method which checks whether a library is page aligned and
* uncompressed in the APK file.
*

Powered by Google App Engine
This is Rietveld 408576698