Backed out changeset 8b110b9889c3 (bug 1196094) as requested by Gijs.
authorMihai Alexandru Michis <malexandru@mozilla.com>
Tue, 28 May 2019 16:01:19 +0300
changeset 535470 b047e2089a784e9e5d08e8057ac4bef6411bf47e
parent 535469 fa7dcd1f369cf19b7af37d9cfc953fe1d131e1c4
child 535471 7cae42dee59feb7d5754a755220b27fe9e684eb7
push id11522
push userffxbld-merge
push dateMon, 01 Jul 2019 09:00:55 +0000
treeherdermozilla-beta@53ea74d2bd09 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1196094
milestone69.0a1
backs out8b110b9889c34d70465d2a2b98b1747ae03f3c3f
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
Backed out changeset 8b110b9889c3 (bug 1196094) as requested by Gijs.
build/pgo/profileserver.py
testing/mozharness/scripts/android_emulator_pgo.py
--- a/build/pgo/profileserver.py
+++ b/build/pgo/profileserver.py
@@ -58,41 +58,37 @@ if __name__ == '__main__':
 
         prefpaths = [os.path.join(profile_data_dir, profile, 'user.js')
                      for profile in base_profiles]
 
         prefs = {}
         for path in prefpaths:
             prefs.update(Preferences.read_prefs(path))
 
-        interpolation = {"server": "%s:%d" % httpd.httpd.server_address}
+        interpolation = {"server": "%s:%d" % httpd.httpd.server_address,
+                         "OOP": "false"}
         for k, v in prefs.items():
             if isinstance(v, string_types):
                 v = v.format(**interpolation)
             prefs[k] = Preferences.cast(v)
 
-        # Enforce e10s. This isn't in one of the user.js files because those
-        # are shared with android, which doesn't want this on. We can't
-        # interpolate because the formatting code only works for strings,
-        # and this is a bool pref.
-        prefs["browser.tabs.remote.autostart"] = True
-
         profile = FirefoxProfile(profile=profilePath,
                                  preferences=prefs,
                                  addons=[os.path.join(
                                      build.topsrcdir, 'tools', 'quitter',
                                      'quitter@mozilla.org.xpi')],
                                  locations=locations)
 
         env = os.environ.copy()
         env["MOZ_CRASHREPORTER_NO_REPORT"] = "1"
         env["XPCOM_DEBUG_BREAK"] = "warn"
-        # We disable sandboxing to make writing profiling data actually work
-        # Bug 1553850 considers fixing this.
-        env["MOZ_DISABLE_CONTENT_SANDBOX"] = "1"
+        # TODO should use e10s and gather data from all processes (bug 1196094).
+        # Note that unittest-required/user.js sets the autostart pref, but it
+        # is ignored by the code in nsAppRunner.
+        env["MOZ_FORCE_DISABLE_E10S"] = "1"
 
         # For VC12+, make sure we can find the right bitness of pgort1x0.dll
         if not substs.get('HAVE_64BIT_BUILD'):
             for e in ('VS140COMNTOOLS', 'VS120COMNTOOLS'):
                 if e not in env:
                     continue
 
                 vcdir = os.path.abspath(os.path.join(env[e], '../../VC/bin'))
--- a/testing/mozharness/scripts/android_emulator_pgo.py
+++ b/testing/mozharness/scripts/android_emulator_pgo.py
@@ -190,22 +190,16 @@ class AndroidProfileRun(TestingMixin, Ba
 
         interpolation = {"server": "%s:%d" % httpd.httpd.server_address,
                          "OOP": "false"}
         for k, v in prefs.items():
             if isinstance(v, string_types):
                 v = v.format(**interpolation)
             prefs[k] = Preferences.cast(v)
 
-        # Enforce 1proc. This isn't in one of the user.js files because those
-        # are shared with desktop, which wants e10s. We can't interpolate
-        # because the formatting code only works for strings, and this is a
-        # bool pref.
-        prefs["browser.tabs.remote.autostart"] = False
-
         outputdir = self.config.get('output_directory', '/sdcard')
         jarlog = posixpath.join(outputdir, 'en-US.log')
         profdata = posixpath.join(outputdir, 'default.profraw')
 
         env = {}
         env["XPCOM_DEBUG_BREAK"] = "warn"
         env["MOZ_IN_AUTOMATION"] = "1"
         env["MOZ_JAR_LOG_FILE"] = jarlog