Merge remote-tracking branch 'origin/master' into custom

This commit is contained in:
Roy Tam 2020-04-03 09:57:28 +08:00
commit 4ecaa49dd0
102 changed files with 772 additions and 102069 deletions

View file

@ -127,13 +127,11 @@ UNIFIED_SOURCES += [
'nsSecureBrowserUIImpl.cpp',
'nsSecurityHeaderParser.cpp',
'NSSErrorsService.cpp',
'nsSiteSecurityService.cpp',
'nsSSLSocketProvider.cpp',
'nsSSLStatus.cpp',
'nsTLSSocketProvider.cpp',
'PSMContentListener.cpp',
'PSMRunnable.cpp',
'PublicKeyPinningService.cpp',
'SecretDecoderRing.cpp',
'SharedSSLState.cpp',
'SSLServerCertVerification.cpp',
@ -141,6 +139,10 @@ UNIFIED_SOURCES += [
'WeakCryptoOverride.cpp',
]
# nsSiteSecurityService exceeded the obj file sections limit because of the
# HSTS preload list so it cannot be built in UNIFIED mode.
SOURCES += ['nsSiteSecurityService.cpp']
IPDL_SOURCES += [
'PPSMContentDownloader.ipdl',
]