equal
deleted
inserted
replaced
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 @@ -8247,16 +8247,31 @@ if test "$MOZ_ENABLE_SKIA"; then |
10 @@ -8217,16 +8217,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 @@ -74,16 +74,19 @@ UNIFIED_SOURCES += [ |
45 @@ -81,16 +81,19 @@ SOURCES += [ |
46 SOURCES += [ |
46 IPDL_SOURCES += [ |
47 'nsNSSCertificateDB.cpp', |
47 'PPSMContentDownloader.ipdl', |
48 ] |
48 ] |
49 |
49 |
50 LOCAL_INCLUDES += [ |
50 LOCAL_INCLUDES += [ |
51 '/security/manager/boot/src', |
51 '/security/manager/boot/src', |
52 ] |
52 ] |
85 #include "NSSCertDBTrustDomain.h" |
85 #include "NSSCertDBTrustDomain.h" |
86 #include "mozilla/Telemetry.h" |
86 #include "mozilla/Telemetry.h" |
87 #include "nsAppDirectoryServiceDefs.h" |
87 #include "nsAppDirectoryServiceDefs.h" |
88 #include "nsCertVerificationThread.h" |
88 #include "nsCertVerificationThread.h" |
89 #include "nsAppDirectoryServiceDefs.h" |
89 #include "nsAppDirectoryServiceDefs.h" |
90 @@ -997,17 +1004,31 @@ nsNSSComponent::InitializeNSS() |
90 @@ -998,17 +1005,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 @@ -207,16 +207,18 @@ if CONFIG['MOZ_B2G_CAMERA'] and CONFIG[' |
126 @@ -197,16 +197,18 @@ if CONFIG['MOZ_B2G_CAMERA'] and CONFIG[' |
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 += [ |