Bug 1555067 - Backed out changeset 0801165e3175. r=jcj a=jcristau
authorEric Rahm <erahm@mozilla.com>
Thu, 13 Jun 2019 20:59:55 +0000
changeset 537115 268c9ae41d1f0b30d5f4cd875427f1d3386617de
parent 537114 d763b1f288a37f783de546ebeb4ce396a9a64cbd
child 537116 673e80300fc06e13b0390a05d98a771bfe96fa47
push id2082
push userffxbld-merge
push dateMon, 01 Jul 2019 08:34:18 +0000
treeherdermozilla-release@2fb19d0466d2 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjcj, jcristau
bugs1555067
milestone68.0
Bug 1555067 - Backed out changeset 0801165e3175. r=jcj a=jcristau NSS_ALLOW_SSLKEYLOGFILE no longer has issues upstream, we can allow it again. Differential Revision: https://phabricator.services.mozilla.com/D34915
python/mozbuild/mozbuild/frontend/gyp_reader.py
--- a/python/mozbuild/mozbuild/frontend/gyp_reader.py
+++ b/python/mozbuild/mozbuild/frontend/gyp_reader.py
@@ -244,20 +244,16 @@ def process_gyp_result(gyp_result, gyp_d
 
             defines = target_conf.get('defines', [])
             if config.substs['CC_TYPE'] == 'clang-cl' 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