Add build config option to disable startup cache precompilation.

This resolves #418.

1 files changed, 10 insertions, 9 deletions

diff --git a/toolkit/mozapps/installer/packager.py b/toolkit/mozapps/installer/packager.py
index f2dc3fac66..40f31646ad 100644
--- a/toolkit/mozapps/installer/packager.py
+++ b/toolkit/mozapps/installer/packager.py
@@ -156,15 +156,16 @@ def precompile_cache(registry, source_path, gre_path, app_path):
             extra_env['TSAN_OPTIONS'] = 'report_bugs=0'
         if buildconfig.substs.get('MOZ_ASAN'):
             extra_env['ASAN_OPTIONS'] = 'detect_leaks=0'
-        if launcher.launch(['xpcshell', '-g', gre_path, '-a', app_path,
-                            '-f', os.path.join(os.path.dirname(__file__),
-                            'precompile_cache.js'),
-                            '-e', 'precompile_startupcache("resource://%s/");'
-                                  % resource],
-                           extra_linker_path=gre_path,
-                           extra_env=extra_env):
-            errors.fatal('Error while running startup cache precompilation')
-            return
+        if buildconfig.substs.get('MOZ_DISABLE_PRECOMPILED_STARTUPCACHE') != '1':
+            if launcher.launch(['xpcshell', '-g', gre_path, '-a', app_path,
+                                '-f', os.path.join(os.path.dirname(__file__),
+                                'precompile_cache.js'),
+                                '-e', 'precompile_startupcache("resource://%s/");'
+                                      % resource],
+                               extra_linker_path=gre_path,
+                               extra_env=extra_env):
+                errors.fatal('Error while running startup cache precompilation')
+                return
         from mozpack.mozjar import JarReader
         jar = JarReader(cache)
         resource = '/resource/%s/' % resource