Sat, 03 Jan 2015 20:18:00 +0100
Conditionally enable double key logic according to:
private browsing mode or privacy.thirdparty.isolate preference and
implement in GetCookieStringCommon and FindCookie where it counts...
With some reservations of how to convince FindCookie users to test
condition and pass a nullptr when disabling double key logic.
1 # vim:set ts=8 sw=8 sts=8 noet:
2 # This Source Code Form is subject to the terms of the Mozilla Public
3 # License, v. 2.0. If a copy of the MPL was not distributed with this
4 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
6 # Don't link the updater against libmozglue. See bug 687139
7 MOZ_GLUE_LDFLAGS =
8 MOZ_GLUE_PROGRAM_LDFLAGS =
10 ifeq ($(OS_ARCH),WINNT)
11 LIBS += $(call EXPAND_LIBNAME_PATH,updatecommon-standalone,../common-standalone)
12 else
13 LIBS += $(call EXPAND_LIBNAME_PATH,updatecommon,../common)
14 endif
16 LIBS += \
17 $(call EXPAND_LIBNAME_PATH,mar,$(DEPTH)/modules/libmar/src) \
18 $(MOZ_BZ2_LIBS) \
19 $(NULL)
21 ifeq ($(OS_ARCH),WINNT)
22 LIBS += $(call EXPAND_LIBNAME_PATH,verifymar,$(DEPTH)/modules/libmar/verify)
23 OS_LIBS += $(call EXPAND_LIBNAME,comctl32 ws2_32 shell32 shlwapi)
24 endif
26 ifdef MOZ_WIDGET_GTK
27 OS_CXXFLAGS += $(TK_CFLAGS)
28 OS_LIBS += $(TK_LIBS)
29 endif
31 ifeq (gonk,$(MOZ_WIDGET_TOOLKIT)) #{
32 OS_LIBS += -lcutils -lsysutils
33 # clear out all the --wrap flags and remove dependency on mozglue for Gonk
34 WRAP_LDFLAGS :=
35 endif #}
37 ifndef MOZ_WINCONSOLE
38 ifdef MOZ_DEBUG
39 MOZ_WINCONSOLE = 1
40 else
41 MOZ_WINCONSOLE = 0
42 endif
43 endif
45 include $(topsrcdir)/config/rules.mk
47 ifdef MOZ_WIDGET_GTK
48 libs:: updater.png
49 $(NSINSTALL) -D $(DIST)/bin/icons
50 $(INSTALL) $(IFLAGS1) $^ $(DIST)/bin/icons
51 endif
53 ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
54 libs::
55 $(NSINSTALL) -D $(DIST)/bin/updater.app
56 rsync -a -C --exclude '*.in' $(srcdir)/macbuild/Contents $(DIST)/bin/updater.app
57 sed -e 's/%APP_NAME%/$(MOZ_APP_DISPLAYNAME)/' $(srcdir)/macbuild/Contents/Resources/English.lproj/InfoPlist.strings.in | \
58 iconv -f UTF-8 -t UTF-16 > $(DIST)/bin/updater.app/Contents/Resources/English.lproj/InfoPlist.strings
59 $(NSINSTALL) -D $(DIST)/bin/updater.app/Contents/MacOS
60 $(NSINSTALL) $(DIST)/bin/updater $(DIST)/bin/updater.app/Contents/MacOS
61 rm -f $(DIST)/bin/updater
62 endif
64 ifeq ($(OS_ARCH),WINNT)
65 EXTRA_LIBS += $(call EXPAND_LIBNAME,crypt32)
66 EXTRA_LIBS += $(call EXPAND_LIBNAME,advapi32)
67 endif
69 CXXFLAGS += $(MOZ_BZ2_CFLAGS)