Bug 874708 - Backout changeset 4655d7317a03 (part of bug 875824) now that the linker itself has a mitigation that works on the SGS4
authorMike Hommey <mh+mozilla@glandium.org>
Sun, 09 Jun 2013 09:24:56 +0200
changeset 145951 8ef966de04d5903c9dcb9dbe050d056dc57cf960
parent 145950 1f228b1d95664000454af81fedee37406017d585
child 145952 313e1ff9266d9a997b565ab3f53f7b006fd2e3d7
push id2697
push userbbajaj@mozilla.com
push dateMon, 05 Aug 2013 18:49:53 +0000
treeherdermozilla-beta@dfec938c7b63 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs874708, 875824
milestone24.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 874708 - Backout changeset 4655d7317a03 (part of bug 875824) now that the linker itself has a mitigation that works on the SGS4
mobile/android/base/mozglue/GeckoLoader.java.in
--- a/mobile/android/base/mozglue/GeckoLoader.java.in
+++ b/mobile/android/base/mozglue/GeckoLoader.java.in
@@ -200,23 +200,16 @@ public final class GeckoLoader {
 
         // setup the libs cache
         String linkerCache = System.getenv("MOZ_LINKER_CACHE");
         if (linkerCache == null) {
             linkerCache = cacheFile.getPath();
             putenv("MOZ_LINKER_CACHE=" + linkerCache);
         }
 
-        // Disable on-demand decompression of the linker on devices where it
-        // is known to cause crashes.
-        if ("samsung".equals(android.os.Build.MANUFACTURER) &&
-            "GT-I9505".equals(android.os.Build.MODEL)) {
-            putenv("MOZ_LINKER_ONDEMAND=0");
-        }
-
 #ifdef MOZ_LINKER_EXTRACT
         putenv("MOZ_LINKER_EXTRACT=1");
         // Ensure that the cache dir is world-writable
         File cacheDir = new File(linkerCache);
         if (cacheDir.isDirectory()) {
             cacheDir.setWritable(true, false);
             cacheDir.setExecutable(true, false);
             cacheDir.setReadable(true, false);