Bug 1519209 - Disable NSS_ALLOW_SSLKEYLOGFILE in beta and release. r=glandium, a=RyanVM
authorEric Rahm <erahm@mozilla.com>
Thu, 10 Jan 2019 13:14:41 -0800
changeset 509431 138a3eb773c865898c1f43e53aa9b3b39e2f38d4
parent 509430 75bae5cabb1c83c4a0333663d1db9c4079130880
child 509432 d566c5f82f8b4d53ed05bc8836ea0b9d7dee051c
push id1905
push userffxbld-merge
push dateMon, 21 Jan 2019 12:33:13 +0000
treeherdermozilla-release@c2fca1944d8c [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersglandium, RyanVM
bugs1519209
milestone65.0
Bug 1519209 - Disable NSS_ALLOW_SSLKEYLOGFILE in beta and release. r=glandium, a=RyanVM This disables NSS_ALLOW_SSLKEYLOGFILE in beta in release in order to avoid shutdown hangs until the NSS project has time to fix the root cause of the issue.
python/mozbuild/mozbuild/frontend/gyp_reader.py
--- a/python/mozbuild/mozbuild/frontend/gyp_reader.py
+++ b/python/mozbuild/mozbuild/frontend/gyp_reader.py
@@ -244,16 +244,20 @@ def process_gyp_result(gyp_result, gyp_d
 
             defines = target_conf.get('defines', [])
             if bool(config.substs['_MSC_VER']) and no_chromium:
                 msvs_settings = gyp.msvs_emulation.MsvsSettings(spec, {})
                 defines.extend(msvs_settings.GetComputedDefines(c))
             for define in defines:
                 if '=' in define:
                     name, value = define.split('=', 1)
+                    # The NSS gyp file doesn't expose a way to override this
+                    # currently, so we do so here.
+                    if name == 'NSS_ALLOW_SSLKEYLOGFILE' and config.substs.get('RELEASE_OR_BETA', False):
+                        continue
                     context['DEFINES'][name] = value
                 else:
                     context['DEFINES'][define] = True
 
             product_dir_dist = '$PRODUCT_DIR/dist/'
             for include in target_conf.get('include_dirs', []):
                 if include.startswith(product_dir_dist):
                     # special-case includes of <(PRODUCT_DIR)/dist/ to match