Index: build/android/incremental_install/java/org/chromium/incrementalinstall/ClassLoaderPatcher.java |
diff --git a/build/android/incremental_install/java/org/chromium/incrementalinstall/ClassLoaderPatcher.java b/build/android/incremental_install/java/org/chromium/incrementalinstall/ClassLoaderPatcher.java |
index 66486c5f7ef23e7ae40e56113d087e961c21ba4d..6e21d11074dc67379cd2db91d8f4818d277ff0a1 100644 |
--- a/build/android/incremental_install/java/org/chromium/incrementalinstall/ClassLoaderPatcher.java |
+++ b/build/android/incremental_install/java/org/chromium/incrementalinstall/ClassLoaderPatcher.java |
@@ -116,16 +116,14 @@ final class ClassLoaderPatcher { |
private File prepareNativeLibsAndroidM(File libDir) throws IOException { |
File localLibsDir = new File(mAppFilesSubDir, "lib"); |
File copyLibsLockFile = new File(mAppFilesSubDir, "libcopy.lock"); |
- // Due to a new SELinux policy, all libs must be copied into the app's |
- // data directory first. |
- // https://code.google.com/p/android/issues/detail?id=79480 |
pkotwicz
2015/10/05 19:39:39
Did you mean to remove this comment?
agrieve
2015/10/05 19:45:35
Done.
|
if (mIsPrimaryProcess) { |
+ // Primary process: Copies native libraries into the app's data directory. |
+ ensureAppFilesSubDirExists(); |
LockFile lockFile = LockFile.acquireRuntimeLock(copyLibsLockFile); |
if (lockFile == null) { |
LockFile.waitForRuntimeLock(copyLibsLockFile, 10 * 1000); |
} else { |
try { |
- ensureAppFilesSubDirExists(); |
localLibsDir.mkdir(); |
localLibsDir.setReadable(true, false); |
localLibsDir.setExecutable(true, false); |