summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndroid Chromium Automerger <chromium-automerger@android>2014-05-08 04:36:37 +0000
committerAndroid Chromium Automerger <chromium-automerger@android>2014-05-08 04:36:37 +0000
commitf9d9766005e4dbfdf528fb2c3521214a693e34f3 (patch)
tree5f4c036c3051cf91936015047e2db762b757a7a5
parent303c775e4874d83ec04b78bb60e33b0d55635ef1 (diff)
downloadopenssl-f9d9766005e4dbfdf528fb2c3521214a693e34f3.tar.gz
Update makefiles after merge of Chromium at 269030
This commit was generated by merge_from_chromium.py. Change-Id: I3787393e5e932318936da1a85dad821a7c1f830b
Diffstat
-rw-r--r--openssl.target.darwin-arm.mk4
-rw-r--r--openssl.target.darwin-arm64.mk4
-rw-r--r--openssl.target.darwin-mips.mk4
-rw-r--r--openssl.target.darwin-x86.mk4
-rw-r--r--openssl.target.darwin-x86_64.mk4
-rw-r--r--openssl.target.linux-arm.mk4
-rw-r--r--openssl.target.linux-arm64.mk4
-rw-r--r--openssl.target.linux-mips.mk4
-rw-r--r--openssl.target.linux-x86.mk4
-rw-r--r--openssl.target.linux-x86_64.mk4
10 files changed, 40 insertions, 0 deletions
diff --git a/openssl.target.darwin-arm.mk b/openssl.target.darwin-arm.mk
index b44c4a8..ee7dda6 100644
--- a/openssl.target.darwin-arm.mk
+++ b/openssl.target.darwin-arm.mk
@@ -640,6 +640,8 @@ MY_DEFS_Debug := \
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
+ '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \
+ '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \
'-DNO_WINDOWS_BRAINDEATH' \
'-DPURIFY' \
'-DMONOLITH' \
@@ -743,6 +745,8 @@ MY_DEFS_Release := \
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
+ '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \
+ '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \
'-DNO_WINDOWS_BRAINDEATH' \
'-DPURIFY' \
'-DMONOLITH' \
diff --git a/openssl.target.darwin-arm64.mk b/openssl.target.darwin-arm64.mk
index ca8aefa..ae2df01 100644
--- a/openssl.target.darwin-arm64.mk
+++ b/openssl.target.darwin-arm64.mk
@@ -628,6 +628,8 @@ MY_DEFS_Debug := \
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
+ '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \
+ '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \
'-DNO_WINDOWS_BRAINDEATH' \
'-DPURIFY' \
'-DMONOLITH' \
@@ -721,6 +723,8 @@ MY_DEFS_Release := \
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
+ '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \
+ '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \
'-DNO_WINDOWS_BRAINDEATH' \
'-DPURIFY' \
'-DMONOLITH' \
diff --git a/openssl.target.darwin-mips.mk b/openssl.target.darwin-mips.mk
index 55a213f..d5c05fc 100644
--- a/openssl.target.darwin-mips.mk
+++ b/openssl.target.darwin-mips.mk
@@ -635,6 +635,8 @@ MY_DEFS_Debug := \
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
+ '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \
+ '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \
'-DNO_WINDOWS_BRAINDEATH' \
'-DPURIFY' \
'-DMONOLITH' \
@@ -736,6 +738,8 @@ MY_DEFS_Release := \
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
+ '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \
+ '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \
'-DNO_WINDOWS_BRAINDEATH' \
'-DPURIFY' \
'-DMONOLITH' \
diff --git a/openssl.target.darwin-x86.mk b/openssl.target.darwin-x86.mk
index 93bc202..f7328e9 100644
--- a/openssl.target.darwin-x86.mk
+++ b/openssl.target.darwin-x86.mk
@@ -641,6 +641,8 @@ MY_DEFS_Debug := \
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
+ '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \
+ '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \
'-DNO_WINDOWS_BRAINDEATH' \
'-DPURIFY' \
'-DMONOLITH' \
@@ -750,6 +752,8 @@ MY_DEFS_Release := \
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
+ '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \
+ '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \
'-DNO_WINDOWS_BRAINDEATH' \
'-DPURIFY' \
'-DMONOLITH' \
diff --git a/openssl.target.darwin-x86_64.mk b/openssl.target.darwin-x86_64.mk
index 07bd9e3..4f6fab0 100644
--- a/openssl.target.darwin-x86_64.mk
+++ b/openssl.target.darwin-x86_64.mk
@@ -644,6 +644,8 @@ MY_DEFS_Debug := \
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
+ '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \
+ '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \
'-DNO_WINDOWS_BRAINDEATH' \
'-DPURIFY' \
'-DMONOLITH' \
@@ -753,6 +755,8 @@ MY_DEFS_Release := \
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
+ '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \
+ '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \
'-DNO_WINDOWS_BRAINDEATH' \
'-DPURIFY' \
'-DMONOLITH' \
diff --git a/openssl.target.linux-arm.mk b/openssl.target.linux-arm.mk
index b44c4a8..ee7dda6 100644
--- a/openssl.target.linux-arm.mk
+++ b/openssl.target.linux-arm.mk
@@ -640,6 +640,8 @@ MY_DEFS_Debug := \
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
+ '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \
+ '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \
'-DNO_WINDOWS_BRAINDEATH' \
'-DPURIFY' \
'-DMONOLITH' \
@@ -743,6 +745,8 @@ MY_DEFS_Release := \
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
+ '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \
+ '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \
'-DNO_WINDOWS_BRAINDEATH' \
'-DPURIFY' \
'-DMONOLITH' \
diff --git a/openssl.target.linux-arm64.mk b/openssl.target.linux-arm64.mk
index ca8aefa..ae2df01 100644
--- a/openssl.target.linux-arm64.mk
+++ b/openssl.target.linux-arm64.mk
@@ -628,6 +628,8 @@ MY_DEFS_Debug := \
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
+ '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \
+ '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \
'-DNO_WINDOWS_BRAINDEATH' \
'-DPURIFY' \
'-DMONOLITH' \
@@ -721,6 +723,8 @@ MY_DEFS_Release := \
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
+ '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \
+ '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \
'-DNO_WINDOWS_BRAINDEATH' \
'-DPURIFY' \
'-DMONOLITH' \
diff --git a/openssl.target.linux-mips.mk b/openssl.target.linux-mips.mk
index 55a213f..d5c05fc 100644
--- a/openssl.target.linux-mips.mk
+++ b/openssl.target.linux-mips.mk
@@ -635,6 +635,8 @@ MY_DEFS_Debug := \
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
+ '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \
+ '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \
'-DNO_WINDOWS_BRAINDEATH' \
'-DPURIFY' \
'-DMONOLITH' \
@@ -736,6 +738,8 @@ MY_DEFS_Release := \
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
+ '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \
+ '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \
'-DNO_WINDOWS_BRAINDEATH' \
'-DPURIFY' \
'-DMONOLITH' \
diff --git a/openssl.target.linux-x86.mk b/openssl.target.linux-x86.mk
index 93bc202..f7328e9 100644
--- a/openssl.target.linux-x86.mk
+++ b/openssl.target.linux-x86.mk
@@ -641,6 +641,8 @@ MY_DEFS_Debug := \
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
+ '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \
+ '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \
'-DNO_WINDOWS_BRAINDEATH' \
'-DPURIFY' \
'-DMONOLITH' \
@@ -750,6 +752,8 @@ MY_DEFS_Release := \
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
+ '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \
+ '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \
'-DNO_WINDOWS_BRAINDEATH' \
'-DPURIFY' \
'-DMONOLITH' \
diff --git a/openssl.target.linux-x86_64.mk b/openssl.target.linux-x86_64.mk
index 07bd9e3..4f6fab0 100644
--- a/openssl.target.linux-x86_64.mk
+++ b/openssl.target.linux-x86_64.mk
@@ -644,6 +644,8 @@ MY_DEFS_Debug := \
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
+ '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \
+ '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \
'-DNO_WINDOWS_BRAINDEATH' \
'-DPURIFY' \
'-DMONOLITH' \
@@ -753,6 +755,8 @@ MY_DEFS_Release := \
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
+ '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \
+ '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \
'-DNO_WINDOWS_BRAINDEATH' \
'-DPURIFY' \
'-DMONOLITH' \
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-03 02:58:13 +0000