summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndroid Chromium Automerger <chromium-automerger@android>2014-05-08 06:34:35 +0000
committerAndroid Chromium Automerger <chromium-automerger@android>2014-05-08 06:34:35 +0000
commitaefa5915b1afd972a37fc1aee03c95a989fef6e4 (patch)
tree871c17a0e3caa8aacf710175e60b5c0f41bc3664
parentf9d9766005e4dbfdf528fb2c3521214a693e34f3 (diff)
downloadopenssl-aefa5915b1afd972a37fc1aee03c95a989fef6e4.tar.gz
Update makefiles after merge of Chromium at 269041
This commit was generated by merge_from_chromium.py. Change-Id: I487c68add4985c510272fb7005638d1257b76b9c
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, 0 insertions, 40 deletions
diff --git a/openssl.target.darwin-arm.mk b/openssl.target.darwin-arm.mk
index ee7dda6..b44c4a8 100644
--- a/openssl.target.darwin-arm.mk
+++ b/openssl.target.darwin-arm.mk
@@ -640,8 +640,6 @@ 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' \
@@ -745,8 +743,6 @@ 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 ae2df01..ca8aefa 100644
--- a/openssl.target.darwin-arm64.mk
+++ b/openssl.target.darwin-arm64.mk
@@ -628,8 +628,6 @@ 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' \
@@ -723,8 +721,6 @@ 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 d5c05fc..55a213f 100644
--- a/openssl.target.darwin-mips.mk
+++ b/openssl.target.darwin-mips.mk
@@ -635,8 +635,6 @@ 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' \
@@ -738,8 +736,6 @@ 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 f7328e9..93bc202 100644
--- a/openssl.target.darwin-x86.mk
+++ b/openssl.target.darwin-x86.mk
@@ -641,8 +641,6 @@ 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' \
@@ -752,8 +750,6 @@ 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 4f6fab0..07bd9e3 100644
--- a/openssl.target.darwin-x86_64.mk
+++ b/openssl.target.darwin-x86_64.mk
@@ -644,8 +644,6 @@ 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' \
@@ -755,8 +753,6 @@ 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 ee7dda6..b44c4a8 100644
--- a/openssl.target.linux-arm.mk
+++ b/openssl.target.linux-arm.mk
@@ -640,8 +640,6 @@ 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' \
@@ -745,8 +743,6 @@ 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 ae2df01..ca8aefa 100644
--- a/openssl.target.linux-arm64.mk
+++ b/openssl.target.linux-arm64.mk
@@ -628,8 +628,6 @@ 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' \
@@ -723,8 +721,6 @@ 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 d5c05fc..55a213f 100644
--- a/openssl.target.linux-mips.mk
+++ b/openssl.target.linux-mips.mk
@@ -635,8 +635,6 @@ 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' \
@@ -738,8 +736,6 @@ 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 f7328e9..93bc202 100644
--- a/openssl.target.linux-x86.mk
+++ b/openssl.target.linux-x86.mk
@@ -641,8 +641,6 @@ 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' \
@@ -752,8 +750,6 @@ 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 4f6fab0..07bd9e3 100644
--- a/openssl.target.linux-x86_64.mk
+++ b/openssl.target.linux-x86_64.mk
@@ -644,8 +644,6 @@ 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' \
@@ -755,8 +753,6 @@ 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:19:22 +0000