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.
michael@0 | 1 | # |
michael@0 | 2 | # This Source Code Form is subject to the terms of the Mozilla Public |
michael@0 | 3 | # License, v. 2.0. If a copy of the MPL was not distributed with this |
michael@0 | 4 | # file, You can obtain one at http://mozilla.org/MPL/2.0/. |
michael@0 | 5 | |
michael@0 | 6 | LIB_IS_C_ONLY = 1 |
michael@0 | 7 | |
michael@0 | 8 | ifeq ($(OS_ARCH),WINNT) |
michael@0 | 9 | DEFFILE = $(CURDIR)/sqlite-processed.def |
michael@0 | 10 | |
michael@0 | 11 | GARBAGE += \ |
michael@0 | 12 | sqlite-version.h \ |
michael@0 | 13 | $(DEFFILE) \ |
michael@0 | 14 | $(NULL) |
michael@0 | 15 | |
michael@0 | 16 | # We generate the appropriate version header file with our python script. |
michael@0 | 17 | sqlite-version.h: sqlite-version.py sqlite3.h |
michael@0 | 18 | $(PYTHON) $^ > $@ |
michael@0 | 19 | |
michael@0 | 20 | # We have to preprocess our def file because we need different symbols in debug |
michael@0 | 21 | # builds exposed that are not built in non-debug builds. |
michael@0 | 22 | $(DEFFILE): sqlite.def |
michael@0 | 23 | @$(call py_action,preprocessor,$(DEFINES) \ |
michael@0 | 24 | $(srcdir)/sqlite.def -o $(DEFFILE)) |
michael@0 | 25 | |
michael@0 | 26 | export:: sqlite-version.h |
michael@0 | 27 | endif |
michael@0 | 28 | |
michael@0 | 29 | ifeq (Darwin,$(OS_TARGET)) |
michael@0 | 30 | # On OSX, with jemalloc enabled, having sqlite linked against mozglue |
michael@0 | 31 | # causes crashes in NSS standalone tools. |
michael@0 | 32 | MOZ_GLUE_LDFLAGS = |
michael@0 | 33 | endif |
michael@0 | 34 | |
michael@0 | 35 | # XXX Force -O2 optimisation on Mac because using the default -O3 causes |
michael@0 | 36 | # crashes. See bug 676499. |
michael@0 | 37 | ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT)) |
michael@0 | 38 | MODULE_OPTIMIZE_FLAGS = -O2 |
michael@0 | 39 | endif |
michael@0 | 40 | |
michael@0 | 41 | # Force /O2 optimisation on Windows because using the default /O1 causes |
michael@0 | 42 | # crashes with MSVC2005 and PGO. See bug 719584. |
michael@0 | 43 | ifeq ($(OS_ARCH),WINNT) |
michael@0 | 44 | MODULE_OPTIMIZE_FLAGS = -O2 |
michael@0 | 45 | endif |
michael@0 | 46 | |
michael@0 | 47 | include $(topsrcdir)/config/rules.mk |