Bug 1043033 - Allow to override on-demand decompression blocklist. r=snorp
authorMike Hommey <mh+mozilla@glandium.org>
Thu, 24 Jul 2014 13:44:11 +0900
changeset 217449 d7335ab12a1fcd25f54e8862fd58a228b6a39ca7
parent 217448 34235900c3a0e300afb1911489fa6e0c8d67df76
child 217450 0f4b90123dba711d38dc61ae9e8f1a56dd3daa24
push id3979
push userraliiev@mozilla.com
push dateMon, 13 Oct 2014 16:35:44 +0000
treeherdermozilla-beta@30f2cc610691 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerssnorp
bugs1043033
milestone34.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 1043033 - Allow to override on-demand decompression blocklist. r=snorp
mobile/android/base/mozglue/GeckoLoader.java.in
--- a/mobile/android/base/mozglue/GeckoLoader.java.in
+++ b/mobile/android/base/mozglue/GeckoLoader.java.in
@@ -208,19 +208,22 @@ public final class GeckoLoader {
         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 ("HTC".equals(android.os.Build.MANUFACTURER) &&
-            "HTC Vision".equals(android.os.Build.MODEL)) {
-            putenv("MOZ_LINKER_ONDEMAND=0");
+        String forced_ondemand = System.getenv("MOZ_LINKER_ONDEMAND");
+        if (forced_ondemand == null) {
+            if ("HTC".equals(android.os.Build.MANUFACTURER) &&
+                "HTC Vision".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);