| Index: content/public/android/java/src/org/chromium/content/app/Linker.java
|
| diff --git a/content/public/android/java/src/org/chromium/content/app/Linker.java b/content/public/android/java/src/org/chromium/content/app/Linker.java
|
| index 8b78d06230c88ac7eb47641833bfb9023e082e2c..417d261ac622722bda2d69aa302459e12d87f3dc 100644
|
| --- a/content/public/android/java/src/org/chromium/content/app/Linker.java
|
| +++ b/content/public/android/java/src/org/chromium/content/app/Linker.java
|
| @@ -170,7 +170,7 @@ public class Linker {
|
| // shared RELRO. Only change this while debugging linker-related issues.
|
| // NOTE: This variable's name is known and expected by the Linker test scripts.
|
| public static final int BROWSER_SHARED_RELRO_CONFIG =
|
| - BROWSER_SHARED_RELRO_CONFIG_ALWAYS;
|
| + BROWSER_SHARED_RELRO_CONFIG_LOW_RAM_ONLY;
|
|
|
| // Constants used to control the value of sMemoryDeviceConfig.
|
| // INIT -> Value is undetermined (will check at runtime).
|
| @@ -424,6 +424,7 @@ public class Linker {
|
| try {
|
| Linker.class.wait();
|
| } catch (InterruptedException ie) {
|
| + // no-op
|
| }
|
| }
|
| useSharedRelrosLocked(sSharedRelros);
|
| @@ -903,6 +904,7 @@ public class Linker {
|
| try {
|
| ParcelFileDescriptor.adoptFd(mRelroFd).close();
|
| } catch (java.io.IOException e) {
|
| + if (DEBUG) Log.e(TAG, "Failed to close fd: " + mRelroFd);
|
| }
|
| mRelroFd = -1;
|
| }
|
|
|