diff options
| author | wolfbeast <mcwerewolf@wolfbeast.com> | 2020-01-30 18:15:38 +0100 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@wolfbeast.com> | 2020-01-30 18:15:38 +0100 |
| commit | 02144371728c3adc333583370186ae25564c5b25 (patch) | |
| tree | 1378b26d0c9ccabd0df0b88c9f751960461e2c5d /toolkit | |
| parent | 633d8804efb92ff021b6747a17041d5d0efb6ecc (diff) | |
| download | uxp-02144371728c3adc333583370186ae25564c5b25.tar.gz | |
Issue mcp-graveyard/UXP#1342 - Remove support for system NSPR/NSS
Diffstat (limited to 'toolkit')
| -rw-r--r-- | toolkit/modules/AppConstants.jsm | 7 | ||||
| -rw-r--r-- | toolkit/modules/moz.build | 1 | ||||
| -rw-r--r-- | toolkit/mozapps/installer/upload-files.mk | 20 |
3 files changed, 9 insertions, 19 deletions
diff --git a/toolkit/modules/AppConstants.jsm b/toolkit/modules/AppConstants.jsm index 40ceb15ba3..41b398efc1 100644 --- a/toolkit/modules/AppConstants.jsm +++ b/toolkit/modules/AppConstants.jsm @@ -187,13 +187,6 @@ MOZ_SAFE_BROWSING: false, #endif - MOZ_SYSTEM_NSS: -#ifdef MOZ_SYSTEM_NSS - true, -#else - false, -#endif - MOZ_PLACES: #ifdef MOZ_PLACES true, diff --git a/toolkit/modules/moz.build b/toolkit/modules/moz.build index 4e647bd7fe..6b181b6aa3 100644 --- a/toolkit/modules/moz.build +++ b/toolkit/modules/moz.build @@ -148,7 +148,6 @@ for var in ('ANDROID_PACKAGE_NAME', DEFINES[var] = CONFIG[var] for var in ('MOZ_TOOLKIT_SEARCH', - 'MOZ_SYSTEM_NSS', 'MOZ_UPDATER', 'MOZ_SWITCHBOARD'): if CONFIG[var]: diff --git a/toolkit/mozapps/installer/upload-files.mk b/toolkit/mozapps/installer/upload-files.mk index 40af34a593..82b550fb4d 100644 --- a/toolkit/mozapps/installer/upload-files.mk +++ b/toolkit/mozapps/installer/upload-files.mk @@ -63,17 +63,15 @@ JSSHELL_BINS = \ $(DLL_PREFIX)mozglue$(DLL_SUFFIX) \ $(NULL) -ifndef MOZ_SYSTEM_NSPR - ifdef MOZ_FOLD_LIBS - JSSHELL_BINS += $(DLL_PREFIX)nss3$(DLL_SUFFIX) - else - JSSHELL_BINS += \ - $(DLL_PREFIX)nspr4$(DLL_SUFFIX) \ - $(DLL_PREFIX)plds4$(DLL_SUFFIX) \ - $(DLL_PREFIX)plc4$(DLL_SUFFIX) \ - $(NULL) - endif # MOZ_FOLD_LIBS -endif # MOZ_SYSTEM_NSPR +ifdef MOZ_FOLD_LIBS + JSSHELL_BINS += $(DLL_PREFIX)nss3$(DLL_SUFFIX) +else + JSSHELL_BINS += \ + $(DLL_PREFIX)nspr4$(DLL_SUFFIX) \ + $(DLL_PREFIX)plds4$(DLL_SUFFIX) \ + $(DLL_PREFIX)plc4$(DLL_SUFFIX) \ + $(NULL) +endif # MOZ_FOLD_LIBS ifdef MSVC_C_RUNTIME_DLL JSSHELL_BINS += $(MSVC_C_RUNTIME_DLL) |