Bug 1562686 - revert remaining unnecessary bit of bug 1187245; r=glandium a=tomprince
authorDustin J. Mitchell <dustin@mozilla.com>
Fri, 23 Aug 2019 12:32:02 +0000
changeset 451324 fb01125329bf28e56389894039be17cd5ab6f622
parent 451323 eefee71b9b1fc1e1cd0b7a60e9ecd38e8ff3accc
child 451325 d96ee8115c5ab8b50b4bc74ad436a40615e0d4f1
push id502
push usermozilla@hocat.ca
push dateWed, 18 Sep 2019 18:05:10 +0000
treeherdermozilla-esr60@fb01125329bf [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersglandium, tomprince
bugs1562686, 1187245
milestone60.9.1
Bug 1562686 - revert remaining unnecessary bit of bug 1187245; r=glandium a=tomprince Differential Revision: https://phabricator.services.mozilla.com/D42644
build/valgrind/mach_commands.py
python/mozbuild/mozbuild/base.py
--- a/build/valgrind/mach_commands.py
+++ b/build/valgrind/mach_commands.py
@@ -89,18 +89,16 @@ class MachCommands(MachCommandBase):
             firefox_args = [httpd.get_url()]
 
             env = os.environ.copy()
             env['G_SLICE'] = 'always-malloc'
             env['MOZ_CC_RUN_DURING_SHUTDOWN'] = '1'
             env['MOZ_CRASHREPORTER_NO_REPORT'] = '1'
             env['XPCOM_DEBUG_BREAK'] = 'warn'
 
-            env.update(self.extra_environment_variables)
-
             outputHandler = OutputHandler(self.log)
             kp_kwargs = {'processOutputLine': [outputHandler]}
 
             valgrind = 'valgrind'
             if not os.path.exists(valgrind):
                 valgrind = findInPath(valgrind)
 
             valgrind_args = [
--- a/python/mozbuild/mozbuild/base.py
+++ b/python/mozbuild/mozbuild/base.py
@@ -279,33 +279,16 @@ class MozbuildObject(ProcessExecutionMix
         elif mozinfo.isWin:
             platform_name = "win" + bits
         elif mozinfo.isMac:
             platform_name = "macosx" + bits
 
         return platform_name, bits + 'bit'
 
     @memoized_property
-    def extra_environment_variables(self):
-        '''Some extra environment variables are stored in .mozconfig.mk.
-        This functions extracts and returns them.'''
-        from mozbuild import shellutil
-        mozconfig_mk = os.path.join(self.topobjdir, '.mozconfig.mk')
-        env = {}
-        with open(mozconfig_mk) as fh:
-            for line in fh:
-                if line.startswith('export '):
-                    exports = shellutil.split(line)[1:]
-                    for e in exports:
-                        if '=' in e:
-                            key, value = e.split('=')
-                            env[key] = value
-        return env
-
-    @memoized_property
     def repository(self):
         '''Get a `mozversioncontrol.Repository` object for the
         top source directory.'''
         # We try to obtain a repo using the configured VCS info first.
         # If we don't have a configure context, fall back to auto-detection.
         try:
             return get_repository_from_build_config(self)
         except BuildEnvironmentNotFoundException: