Skip to content

Commit ff9d05f

Browse files
committed
Bug 852068 - Update removed-files after bug 648407. r=ted
1 parent 7c0e271 commit ff9d05f

File tree

3 files changed

+21
-1
lines changed

3 files changed

+21
-1
lines changed

b2g/installer/package-manifest.in

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,9 @@
113113
@BINPATH@/application.ini
114114
@BINPATH@/platform.ini
115115
#ifndef XP_OS2
116+
#ifndef MOZ_FOLD_LIBS
116117
@BINPATH@/@DLL_PREFIX@mozsqlite3@DLL_SUFFIX@
118+
#endif
117119
#else
118120
@BINPATH@/mozsqlt3@DLL_SUFFIX@
119121
#endif

b2g/installer/removed-files.in

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,13 @@ run-mozilla.sh
1010
#endif
1111
defaults/preferences/services-sync.js
1212
defaults/preferences/healthreport-prefs.js
13-
components/dom_sms.xpt
13+
components/dom_sms.xpt
14+
#ifdef MOZ_FOLD_LIBS
15+
@DLL_PREFIX@nspr4@DLL_SUFFIX@
16+
@DLL_PREFIX@plds4@DLL_SUFFIX@
17+
@DLL_PREFIX@plc4@DLL_SUFFIX@
18+
@DLL_PREFIX@ssl3@DLL_SUFFIX@
19+
@DLL_PREFIX@smime3@DLL_SUFFIX@
20+
@DLL_PREFIX@nssutil3@DLL_SUFFIX@
21+
@DLL_PREFIX@mozsqlite3@DLL_SUFFIX@
22+
#endif

browser/installer/removed-files.in

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,15 @@
1717
#ifdef MOZ_STATIC_JS
1818
@DLL_PREFIX@mozjs@DLL_SUFFIX@
1919
#endif
20+
#ifdef MOZ_FOLD_LIBS
21+
@DLL_PREFIX@nspr4@DLL_SUFFIX@
22+
@DLL_PREFIX@plds4@DLL_SUFFIX@
23+
@DLL_PREFIX@plc4@DLL_SUFFIX@
24+
@DLL_PREFIX@ssl3@DLL_SUFFIX@
25+
@DLL_PREFIX@smime3@DLL_SUFFIX@
26+
@DLL_PREFIX@nssutil3@DLL_SUFFIX@
27+
@DLL_PREFIX@mozsqlite3@DLL_SUFFIX@
28+
#endif
2029
LICENSE
2130
browserconfig.properties
2231
chrome/US.jar

0 commit comments

Comments
 (0)