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; |
} |