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 @@ -8302,16 +8302,31 @@ if test "$MOZ_ENABLE_SKIA"; then |
10 @@ -8268,16 +8268,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 @@ -95,16 +95,19 @@ FAIL_ON_WARNINGS = True |
45 @@ -77,16 +77,19 @@ SOURCES += [ |
46 |
46 'nsNSSVersion.cpp', |
47 FINAL_LIBRARY = 'xul' |
47 'PSMContentListener.cpp', |
|
48 ] |
48 |
49 |
49 LOCAL_INCLUDES += [ |
50 LOCAL_INCLUDES += [ |
50 '../../../certverifier', |
51 '/security/manager/boot/src', |
51 '../../../pkix/include', |
|
52 ] |
52 ] |
53 |
53 |
54 +CXXFLAGS += sorted(CONFIG['NSSHELPER_CFLAGS']) |
54 +CXXFLAGS += sorted(CONFIG['NSSHELPER_CFLAGS']) |
55 +OS_LIBS += sorted(CONFIG['NSSHELPER_LIBS']) |
55 +OS_LIBS += sorted(CONFIG['NSSHELPER_LIBS']) |
56 + |
56 + |
57 if CONFIG['NSS_DISABLE_DBM']: |
57 if not CONFIG['MOZ_NO_SMART_CARDS']: |
58 DEFINES['NSS_DISABLE_DBM'] = '1' |
58 UNIFIED_SOURCES += [ |
|
59 'nsSmartCardMonitor.cpp', |
|
60 ] |
59 |
61 |
60 DEFINES['SSL_DISABLE_DEPRECATED_CIPHER_SUITE_NAMES'] = 'True' |
62 if CONFIG['MOZ_XUL']: |
61 DEFINES['NSS_ENABLE_ECC'] = 'True' |
63 UNIFIED_SOURCES += [ |
62 for var in ('DLL_PREFIX', 'DLL_SUFFIX'): |
64 'nsCertTree.cpp', |
63 DEFINES[var] = '"%s"' % CONFIG[var] |
|
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 @@ -1,14 +1,21 @@ |
68 @@ -1,14 +1,21 @@ |
69 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- |
69 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- |
85 #include "NSSCertDBTrustDomain.h" |
85 #include "NSSCertDBTrustDomain.h" |
86 #include "mozilla/Telemetry.h" |
86 #include "mozilla/Telemetry.h" |
87 #include "nsCertVerificationThread.h" |
87 #include "nsCertVerificationThread.h" |
88 #include "nsAppDirectoryServiceDefs.h" |
88 #include "nsAppDirectoryServiceDefs.h" |
89 #include "nsComponentManagerUtils.h" |
89 #include "nsComponentManagerUtils.h" |
90 @@ -945,17 +952,31 @@ nsNSSComponent::InitializeNSS() |
90 @@ -986,17 +993,31 @@ nsNSSComponent::InitializeNSS() |
91 if (NS_FAILED(rv)) { |
91 if (NS_FAILED(rv)) { |
92 nsPSMInitPanic::SetPanic(); |
92 nsPSMInitPanic::SetPanic(); |
93 return NS_ERROR_NOT_AVAILABLE; |
93 return NS_ERROR_NOT_AVAILABLE; |
94 } |
94 } |
95 |
95 |
121 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")); |
122 } |
122 } |
123 diff --git a/toolkit/library/moz.build b/toolkit/library/moz.build |
123 diff --git a/toolkit/library/moz.build b/toolkit/library/moz.build |
124 --- a/toolkit/library/moz.build |
124 --- a/toolkit/library/moz.build |
125 +++ b/toolkit/library/moz.build |
125 +++ b/toolkit/library/moz.build |
126 @@ -213,16 +213,18 @@ if CONFIG['MOZ_B2G_CAMERA']: |
126 @@ -208,16 +208,18 @@ if CONFIG['MOZ_B2G_CAMERA']: |
127 'stagefright_omx', |
127 'stagefright_omx', |
128 ] |
128 ] |
129 |
129 |
130 if CONFIG['OS_ARCH'] == 'Linux' and CONFIG['OS_TARGET'] != 'Android': |
130 if CONFIG['OS_ARCH'] == 'Linux' and CONFIG['OS_TARGET'] != 'Android': |
131 OS_LIBS += [ |
131 OS_LIBS += [ |