commit | 7aead31bcd04864257308a5ce4509422d8fe83db | [log] [tgz] |
---|---|---|
author | petrcermak <petrcermak@chromium.org> | Mon May 18 16:25:20 2015 |
committer | Commit bot <commit-bot@chromium.org> | Mon May 18 16:25:29 2015 |
tree | 98691ab4719d1071f617e97d1e91e4cb940a9e0d | |
parent | f1aa907921ed7fd95c8a9fb35e41aaca36a31067 [diff] |
Fix direct load from APK on Samsung devices This patch re-enables loading from APK on Samsung devices where the mmap exec check is skipped (due to https://code.google.com/p/chromium/issues/detail?id=448084). BUG=489267 Review URL: https://codereview.chromium.org/1129223007 Cr-Commit-Position: refs/heads/master@{#330371}
diff --git a/base/android/java/src/org/chromium/base/library_loader/LibraryLoader.java b/base/android/java/src/org/chromium/base/library_loader/LibraryLoader.java index 9dc6865..f892937 100644 --- a/base/android/java/src/org/chromium/base/library_loader/LibraryLoader.java +++ b/base/android/java/src/org/chromium/base/library_loader/LibraryLoader.java
@@ -253,6 +253,9 @@ apkFilePath = context.getApplicationInfo().sourceDir; if (mProbeMapApkWithExecPermission) { mMapApkWithExecPermission = Linker.checkMapExecSupport(apkFilePath); + } else { + // Assume map executable support on Samsung devices. + mMapApkWithExecPermission = true; } if (!mMapApkWithExecPermission && Linker.isInZipFile()) { Log.w(TAG, "the no map executable support fallback will be used because"