Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-04-02 20:42:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Backed out changeset 0b714d638157 (Bug 1692990) as it cause system nss build to fail. r=padenot

Browse Source 
Differential Revision: https://phabricator.services.mozilla.com/D105737
This commit is contained in:
Benjamin Beurdouche 2021-02-19 10:22:17 +00:00
parent 782a30533f
commit d3ac263f8c
2 changed files with 0 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
security/generate_certdata-testlib.py
View File

@ -1,23 +0,0 @@
#!/usr/bin/env python
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
# This exists to paper over differences between gyp's `action` definitions
# and moz.build `GENERATED_FILES` semantics.
import buildconfig
import os
import subprocess
def main(output, *inputs):
env = dict(os.environ)
env["PERL"] = str(buildconfig.substs["PERL"])
output.write(
subprocess.check_output(
[buildconfig.substs["PYTHON3"], inputs[0], inputs[2]], env=env
)
)
return None

3
security/moz.build
View File

@ -81,8 +81,6 @@ gyp_vars["nss_dist_dir"] = "$PRODUCT_DIR/dist"
# This forces it to put them in dist/include/nss.
gyp_vars["nss_public_dist_dir"] = "$PRODUCT_DIR/dist"
gyp_vars["nss_dist_obj_dir"] = "$PRODUCT_DIR/dist/bin"
# We need specific features and tests on mozilla-central.
gyp_vars["mozilla_central"] = 1
# We don't currently build NSS tests.
gyp_vars["disable_tests"] = 1
gyp_vars["disable_dbm"] = 1
@ -155,7 +153,6 @@ GYP_DIRS["nss"].no_unified = True
# Python scripts that can be used in moz.build GENERATED_FILES.
GYP_DIRS["nss"].action_overrides = {
"generate_certdata_c": "generate_certdata.py",
"generate_certdata-testlib_c": "generate_certdata-testlib.py",
"generate_mapfile": "generate_mapfile.py",
}