5 References: |
5 References: |
6 |
6 |
7 diff --git a/configure.in b/configure.in |
7 diff --git a/configure.in b/configure.in |
8 --- a/configure.in |
8 --- a/configure.in |
9 +++ b/configure.in |
9 +++ b/configure.in |
10 @@ -8199,16 +8199,31 @@ if test "$MOZ_ENABLE_SKIA"; then |
10 @@ -8302,16 +8302,31 @@ if test "$MOZ_ENABLE_SKIA"; then |
11 MOZ_ENABLE_SKIA_GPU=1 |
11 MOZ_ENABLE_SKIA_GPU=1 |
12 AC_DEFINE(USE_SKIA_GPU) |
12 AC_DEFINE(USE_SKIA_GPU) |
13 AC_SUBST(MOZ_ENABLE_SKIA_GPU) |
13 AC_SUBST(MOZ_ENABLE_SKIA_GPU) |
14 fi |
14 fi |
15 fi |
15 fi |
40 AC_DEFINE(MOZ_XUL) |
40 AC_DEFINE(MOZ_XUL) |
41 else |
41 else |
42 diff --git a/security/manager/ssl/src/moz.build b/security/manager/ssl/src/moz.build |
42 diff --git a/security/manager/ssl/src/moz.build b/security/manager/ssl/src/moz.build |
43 --- a/security/manager/ssl/src/moz.build |
43 --- a/security/manager/ssl/src/moz.build |
44 +++ b/security/manager/ssl/src/moz.build |
44 +++ b/security/manager/ssl/src/moz.build |
45 @@ -91,16 +91,19 @@ FAIL_ON_WARNINGS = True |
45 @@ -95,16 +95,19 @@ FAIL_ON_WARNINGS = True |
46 |
46 |
47 FINAL_LIBRARY = 'xul' |
47 FINAL_LIBRARY = 'xul' |
48 |
48 |
49 LOCAL_INCLUDES += [ |
49 LOCAL_INCLUDES += [ |
50 '../../../certverifier', |
50 '../../../certverifier', |
63 DEFINES[var] = '"%s"' % CONFIG[var] |
63 DEFINES[var] = '"%s"' % CONFIG[var] |
64 |
64 |
65 diff --git a/security/manager/ssl/src/nsNSSComponent.cpp b/security/manager/ssl/src/nsNSSComponent.cpp |
65 diff --git a/security/manager/ssl/src/nsNSSComponent.cpp b/security/manager/ssl/src/nsNSSComponent.cpp |
66 --- a/security/manager/ssl/src/nsNSSComponent.cpp |
66 --- a/security/manager/ssl/src/nsNSSComponent.cpp |
67 +++ b/security/manager/ssl/src/nsNSSComponent.cpp |
67 +++ b/security/manager/ssl/src/nsNSSComponent.cpp |
68 @@ -3,16 +3,23 @@ |
68 @@ -1,14 +1,21 @@ |
|
69 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- |
|
70 * |
69 * This Source Code Form is subject to the terms of the Mozilla Public |
71 * This Source Code Form is subject to the terms of the Mozilla Public |
70 * License, v. 2.0. If a copy of the MPL was not distributed with this |
72 * License, v. 2.0. If a copy of the MPL was not distributed with this |
71 * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ |
73 * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ |
72 |
|
73 #ifdef MOZ_LOGGING |
|
74 #define FORCE_PR_LOG 1 |
|
75 #endif |
|
76 |
74 |
77 +#ifdef MOZ_ENABLE_NSSHELPER |
75 +#ifdef MOZ_ENABLE_NSSHELPER |
78 +#pragma GCC visibility push(default) |
76 +#pragma GCC visibility push(default) |
79 +#include <nss-shared-helper.h> |
77 +#include <nss-shared-helper.h> |
80 +#pragma GCC visibility pop |
78 +#pragma GCC visibility pop |
87 #include "NSSCertDBTrustDomain.h" |
85 #include "NSSCertDBTrustDomain.h" |
88 #include "mozilla/Telemetry.h" |
86 #include "mozilla/Telemetry.h" |
89 #include "nsCertVerificationThread.h" |
87 #include "nsCertVerificationThread.h" |
90 #include "nsAppDirectoryServiceDefs.h" |
88 #include "nsAppDirectoryServiceDefs.h" |
91 #include "nsComponentManagerUtils.h" |
89 #include "nsComponentManagerUtils.h" |
92 @@ -943,17 +950,31 @@ nsNSSComponent::InitializeNSS() |
90 @@ -945,17 +952,31 @@ nsNSSComponent::InitializeNSS() |
93 if (NS_FAILED(rv)) { |
91 if (NS_FAILED(rv)) { |
94 nsPSMInitPanic::SetPanic(); |
92 nsPSMInitPanic::SetPanic(); |
95 return NS_ERROR_NOT_AVAILABLE; |
93 return NS_ERROR_NOT_AVAILABLE; |
96 } |
94 } |
97 |
95 |
120 init_rv = ::mozilla::psm::InitializeNSS(profileStr.get(), true); |
118 init_rv = ::mozilla::psm::InitializeNSS(profileStr.get(), true); |
121 } |
119 } |
122 if (init_rv != SECSuccess) { |
120 if (init_rv != SECSuccess) { |
123 PR_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("could not init in r/o either\n")); |
121 PR_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("could not init in r/o either\n")); |
124 } |
122 } |
125 diff --git a/toolkit/library/libxul.mozbuild b/toolkit/library/libxul.mozbuild |
123 diff --git a/toolkit/library/moz.build b/toolkit/library/moz.build |
126 --- a/toolkit/library/libxul.mozbuild |
124 --- a/toolkit/library/moz.build |
127 +++ b/toolkit/library/libxul.mozbuild |
125 +++ b/toolkit/library/moz.build |
128 @@ -22,16 +22,18 @@ DELAYLOAD_DLLS += [ |
126 @@ -213,16 +213,18 @@ if CONFIG['MOZ_B2G_CAMERA']: |
129 'psapi.dll', |
127 'stagefright_omx', |
130 'rasapi32.dll', |
128 ] |
131 'rasdlg.dll', |
129 |
132 'secur32.dll', |
130 if CONFIG['OS_ARCH'] == 'Linux' and CONFIG['OS_TARGET'] != 'Android': |
133 'wininet.dll', |
131 OS_LIBS += [ |
134 'winspool.drv' |
132 'rt', |
135 ] |
133 ] |
136 |
134 |
137 +OS_LIBS += sorted(CONFIG['NSSHELPER_LIBS']) |
135 +OS_LIBS += sorted(CONFIG['NSSHELPER_LIBS']) |
138 + |
136 + |
139 if CONFIG['MOZ_METRO']: |
137 OS_LIBS += CONFIG['MOZ_CAIRO_OSLIBS'] |
140 DELAYLOAD_DLLS += [ |
138 OS_LIBS += CONFIG['MOZ_WEBRTC_X11_LIBS'] |
141 'API-MS-WIN-CORE-WINRT-L' + CONFIG['CRTEXPDLLVERSION'] + '.DLL', |
|
142 'API-MS-WIN-CORE-WINRT-STRING-L' + CONFIG['CRTEXPDLLVERSION'] + '.DLL', |
|
143 'uiautomationcore.dll' |
|
144 ] |
|
145 |
139 |
146 if CONFIG['ACCESSIBILITY']: |
140 if CONFIG['MOZ_NATIVE_JPEG']: |
|
141 OS_LIBS += CONFIG['MOZ_JPEG_LIBS'] |
|
142 |
|
143 if CONFIG['MOZ_NATIVE_PNG']: |
|
144 OS_LIBS += CONFIG['MOZ_PNG_LIBS'] |