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

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

Issue 141223002: Move the android library loader from content to base (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 11 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/content/public/android/java/src/org/chromium/content/app/Linker.java b/base/android/java/src/org/chromium/base/library_loader/Linker.java
similarity index 99%
rename from content/public/android/java/src/org/chromium/content/app/Linker.java
rename to base/android/java/src/org/chromium/base/library_loader/Linker.java
index 8b78d06230c88ac7eb47641833bfb9023e082e2c..375987583d6cc1b2ecd5c41e3af24fe0b8182824 100644
--- a/content/public/android/java/src/org/chromium/content/app/Linker.java
+++ b/base/android/java/src/org/chromium/base/library_loader/Linker.java
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-package org.chromium.content.app;
+package org.chromium.base.library_loader;
import android.os.Bundle;
import android.os.Parcel;
@@ -424,6 +424,7 @@ public class Linker {
try {
Linker.class.wait();
} catch (InterruptedException ie) {
+ // Ignore
}
}
useSharedRelrosLocked(sSharedRelros);
@@ -903,6 +904,7 @@ public class Linker {
try {
ParcelFileDescriptor.adoptFd(mRelroFd).close();
} catch (java.io.IOException e) {
+ // Ignore
}
mRelroFd = -1;
}

Powered by Google App Engine
This is Rietveld 408576698