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 | # This Source Code Form is subject to the terms of the Mozilla Public |
michael@0 | 2 | # License, v. 2.0. If a copy of the MPL was not distributed with this |
michael@0 | 3 | # file, You can obtain one at http://mozilla.org/MPL/2.0/. |
michael@0 | 4 | |
michael@0 | 5 | include $(MOZILLA_DIR)/build/binary-location.mk |
michael@0 | 6 | |
michael@0 | 7 | browser_path := '"$(browser_path)"' |
michael@0 | 8 | |
michael@0 | 9 | _PROFILE_DIR = $(TARGET_DEPTH)/_profile/pgo |
michael@0 | 10 | |
michael@0 | 11 | ABSOLUTE_TOPSRCDIR = $(abspath $(MOZILLA_DIR)) |
michael@0 | 12 | _CERTS_SRC_DIR = $(ABSOLUTE_TOPSRCDIR)/build/pgo/certs |
michael@0 | 13 | |
michael@0 | 14 | AUTOMATION_PPARGS = \ |
michael@0 | 15 | -DBROWSER_PATH=$(browser_path) \ |
michael@0 | 16 | -DXPC_BIN_PATH='"$(LIBXUL_DIST)/bin"' \ |
michael@0 | 17 | -DBIN_SUFFIX='"$(BIN_SUFFIX)"' \ |
michael@0 | 18 | -DPROFILE_DIR='"$(_PROFILE_DIR)"' \ |
michael@0 | 19 | -DCERTS_SRC_DIR='"$(_CERTS_SRC_DIR)"' \ |
michael@0 | 20 | -DPERL='"$(PERL)"' \ |
michael@0 | 21 | $(NULL) |
michael@0 | 22 | |
michael@0 | 23 | ifeq ($(OS_ARCH),Darwin) |
michael@0 | 24 | AUTOMATION_PPARGS += -DIS_MAC=1 |
michael@0 | 25 | else |
michael@0 | 26 | AUTOMATION_PPARGS += -DIS_MAC=0 |
michael@0 | 27 | endif |
michael@0 | 28 | |
michael@0 | 29 | ifeq ($(OS_ARCH),Linux) |
michael@0 | 30 | AUTOMATION_PPARGS += -DIS_LINUX=1 |
michael@0 | 31 | else |
michael@0 | 32 | AUTOMATION_PPARGS += -DIS_LINUX=0 |
michael@0 | 33 | endif |
michael@0 | 34 | |
michael@0 | 35 | ifeq ($(MOZ_BUILD_APP),camino) |
michael@0 | 36 | AUTOMATION_PPARGS += -DIS_CAMINO=1 |
michael@0 | 37 | else |
michael@0 | 38 | AUTOMATION_PPARGS += -DIS_CAMINO=0 |
michael@0 | 39 | endif |
michael@0 | 40 | |
michael@0 | 41 | ifeq ($(host_os), cygwin) |
michael@0 | 42 | AUTOMATION_PPARGS += -DIS_CYGWIN=1 |
michael@0 | 43 | endif |
michael@0 | 44 | |
michael@0 | 45 | ifeq ($(ENABLE_TESTS), 1) |
michael@0 | 46 | AUTOMATION_PPARGS += -DIS_TEST_BUILD=1 |
michael@0 | 47 | else |
michael@0 | 48 | AUTOMATION_PPARGS += -DIS_TEST_BUILD=0 |
michael@0 | 49 | endif |
michael@0 | 50 | |
michael@0 | 51 | ifeq ($(MOZ_DEBUG), 1) |
michael@0 | 52 | AUTOMATION_PPARGS += -DIS_DEBUG_BUILD=1 |
michael@0 | 53 | else |
michael@0 | 54 | AUTOMATION_PPARGS += -DIS_DEBUG_BUILD=0 |
michael@0 | 55 | endif |
michael@0 | 56 | |
michael@0 | 57 | ifdef MOZ_CRASHREPORTER |
michael@0 | 58 | AUTOMATION_PPARGS += -DCRASHREPORTER=1 |
michael@0 | 59 | else |
michael@0 | 60 | AUTOMATION_PPARGS += -DCRASHREPORTER=0 |
michael@0 | 61 | endif |
michael@0 | 62 | |
michael@0 | 63 | ifdef MOZ_ASAN |
michael@0 | 64 | AUTOMATION_PPARGS += -DIS_ASAN=1 |
michael@0 | 65 | else |
michael@0 | 66 | AUTOMATION_PPARGS += -DIS_ASAN=0 |
michael@0 | 67 | endif |
michael@0 | 68 | |
michael@0 | 69 | automation.py: $(MOZILLA_DIR)/build/automation.py.in $(MOZILLA_DIR)/build/automation-build.mk |
michael@0 | 70 | $(call py_action,preprocessor, \ |
michael@0 | 71 | $(AUTOMATION_PPARGS) $(DEFINES) $(ACDEFINES) $< -o $@) |
michael@0 | 72 | |
michael@0 | 73 | GARBAGE += automation.py automation.pyc |