From 73ad95ba5a90a8b89099b4e997962345a2dfc3ba Mon Sep 17 00:00:00 2001 From: Mike Hommey Date: Thu, 24 Jul 2014 13:44:11 +0900 Subject: [PATCH] Bug 1043033 - Allow to override on-demand decompression blocklist. r=snorp --- mobile/android/base/mozglue/GeckoLoader.java.in | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/mobile/android/base/mozglue/GeckoLoader.java.in b/mobile/android/base/mozglue/GeckoLoader.java.in index 25e0f7cf4eb..9c2ce0dc9c7 100644 --- a/mobile/android/base/mozglue/GeckoLoader.java.in +++ b/mobile/android/base/mozglue/GeckoLoader.java.in @@ -213,9 +213,12 @@ public final class GeckoLoader { // 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