summaryrefslogtreecommitdiff
path: root/courgette
diff options
context:
space:
mode:
authorTorne (Richard Coles) <torne@google.com>2014-06-25 10:30:53 +0100
committerTorne (Richard Coles) <torne@google.com>2014-06-25 10:30:53 +0100
commit6d86b77056ed63eb6871182f42a9fd5f07550f90 (patch)
tree4bd56255660f52e406fbd45083c006cd6ddb2877 /courgette
parente9f930807da3850e29ecc641d2becc0403b5709c (diff)
downloadchromium_org-6d86b77056ed63eb6871182f42a9fd5f07550f90.tar.gz
Merge from Chromium at DEPS revision 278856
This commit was generated by merge_to_master.py. Change-Id: If3807744d3e5d3ee84b897bd2d099a2b7ed2e7a3
Diffstat (limited to 'courgette')
-rw-r--r--courgette/courgette_lib.target.darwin-arm.mk2
-rw-r--r--courgette/courgette_lib.target.darwin-arm64.mk2
-rw-r--r--courgette/courgette_lib.target.darwin-mips.mk2
-rw-r--r--courgette/courgette_lib.target.darwin-x86.mk2
-rw-r--r--courgette/courgette_lib.target.darwin-x86_64.mk2
-rw-r--r--courgette/courgette_lib.target.linux-arm.mk2
-rw-r--r--courgette/courgette_lib.target.linux-arm64.mk2
-rw-r--r--courgette/courgette_lib.target.linux-mips.mk2
-rw-r--r--courgette/courgette_lib.target.linux-x86.mk2
-rw-r--r--courgette/courgette_lib.target.linux-x86_64.mk2
10 files changed, 20 insertions, 0 deletions
diff --git a/courgette/courgette_lib.target.darwin-arm.mk b/courgette/courgette_lib.target.darwin-arm.mk
index b912feb97f..3b135a2272 100644
--- a/courgette/courgette_lib.target.darwin-arm.mk
+++ b/courgette/courgette_lib.target.darwin-arm.mk
@@ -109,6 +109,7 @@ MY_DEFS_Debug := \
'-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \
'-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \
'-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \
+ '-DDATA_REDUCTION_PROXY_WARMUP_URL="http://www.gstatic.com/generate_204"' \
'-DVIDEO_HOLE=1' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
@@ -209,6 +210,7 @@ MY_DEFS_Release := \
'-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \
'-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \
'-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \
+ '-DDATA_REDUCTION_PROXY_WARMUP_URL="http://www.gstatic.com/generate_204"' \
'-DVIDEO_HOLE=1' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
diff --git a/courgette/courgette_lib.target.darwin-arm64.mk b/courgette/courgette_lib.target.darwin-arm64.mk
index 36d721fea7..0cfd48723e 100644
--- a/courgette/courgette_lib.target.darwin-arm64.mk
+++ b/courgette/courgette_lib.target.darwin-arm64.mk
@@ -99,6 +99,7 @@ MY_DEFS_Debug := \
'-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \
'-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \
'-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \
+ '-DDATA_REDUCTION_PROXY_WARMUP_URL="http://www.gstatic.com/generate_204"' \
'-DVIDEO_HOLE=1' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
@@ -188,6 +189,7 @@ MY_DEFS_Release := \
'-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \
'-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \
'-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \
+ '-DDATA_REDUCTION_PROXY_WARMUP_URL="http://www.gstatic.com/generate_204"' \
'-DVIDEO_HOLE=1' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
diff --git a/courgette/courgette_lib.target.darwin-mips.mk b/courgette/courgette_lib.target.darwin-mips.mk
index 56f58c74a3..d8678d7689 100644
--- a/courgette/courgette_lib.target.darwin-mips.mk
+++ b/courgette/courgette_lib.target.darwin-mips.mk
@@ -103,6 +103,7 @@ MY_DEFS_Debug := \
'-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \
'-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \
'-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \
+ '-DDATA_REDUCTION_PROXY_WARMUP_URL="http://www.gstatic.com/generate_204"' \
'-DVIDEO_HOLE=1' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
@@ -197,6 +198,7 @@ MY_DEFS_Release := \
'-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \
'-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \
'-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \
+ '-DDATA_REDUCTION_PROXY_WARMUP_URL="http://www.gstatic.com/generate_204"' \
'-DVIDEO_HOLE=1' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
diff --git a/courgette/courgette_lib.target.darwin-x86.mk b/courgette/courgette_lib.target.darwin-x86.mk
index 3768c8cc17..e521dc3f70 100644
--- a/courgette/courgette_lib.target.darwin-x86.mk
+++ b/courgette/courgette_lib.target.darwin-x86.mk
@@ -104,6 +104,7 @@ MY_DEFS_Debug := \
'-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \
'-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \
'-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \
+ '-DDATA_REDUCTION_PROXY_WARMUP_URL="http://www.gstatic.com/generate_204"' \
'-DVIDEO_HOLE=1' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
@@ -198,6 +199,7 @@ MY_DEFS_Release := \
'-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \
'-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \
'-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \
+ '-DDATA_REDUCTION_PROXY_WARMUP_URL="http://www.gstatic.com/generate_204"' \
'-DVIDEO_HOLE=1' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
diff --git a/courgette/courgette_lib.target.darwin-x86_64.mk b/courgette/courgette_lib.target.darwin-x86_64.mk
index 37946694e1..29c2c8a5e1 100644
--- a/courgette/courgette_lib.target.darwin-x86_64.mk
+++ b/courgette/courgette_lib.target.darwin-x86_64.mk
@@ -103,6 +103,7 @@ MY_DEFS_Debug := \
'-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \
'-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \
'-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \
+ '-DDATA_REDUCTION_PROXY_WARMUP_URL="http://www.gstatic.com/generate_204"' \
'-DVIDEO_HOLE=1' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
@@ -196,6 +197,7 @@ MY_DEFS_Release := \
'-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \
'-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \
'-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \
+ '-DDATA_REDUCTION_PROXY_WARMUP_URL="http://www.gstatic.com/generate_204"' \
'-DVIDEO_HOLE=1' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
diff --git a/courgette/courgette_lib.target.linux-arm.mk b/courgette/courgette_lib.target.linux-arm.mk
index b912feb97f..3b135a2272 100644
--- a/courgette/courgette_lib.target.linux-arm.mk
+++ b/courgette/courgette_lib.target.linux-arm.mk
@@ -109,6 +109,7 @@ MY_DEFS_Debug := \
'-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \
'-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \
'-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \
+ '-DDATA_REDUCTION_PROXY_WARMUP_URL="http://www.gstatic.com/generate_204"' \
'-DVIDEO_HOLE=1' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
@@ -209,6 +210,7 @@ MY_DEFS_Release := \
'-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \
'-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \
'-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \
+ '-DDATA_REDUCTION_PROXY_WARMUP_URL="http://www.gstatic.com/generate_204"' \
'-DVIDEO_HOLE=1' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
diff --git a/courgette/courgette_lib.target.linux-arm64.mk b/courgette/courgette_lib.target.linux-arm64.mk
index 36d721fea7..0cfd48723e 100644
--- a/courgette/courgette_lib.target.linux-arm64.mk
+++ b/courgette/courgette_lib.target.linux-arm64.mk
@@ -99,6 +99,7 @@ MY_DEFS_Debug := \
'-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \
'-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \
'-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \
+ '-DDATA_REDUCTION_PROXY_WARMUP_URL="http://www.gstatic.com/generate_204"' \
'-DVIDEO_HOLE=1' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
@@ -188,6 +189,7 @@ MY_DEFS_Release := \
'-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \
'-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \
'-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \
+ '-DDATA_REDUCTION_PROXY_WARMUP_URL="http://www.gstatic.com/generate_204"' \
'-DVIDEO_HOLE=1' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
diff --git a/courgette/courgette_lib.target.linux-mips.mk b/courgette/courgette_lib.target.linux-mips.mk
index 56f58c74a3..d8678d7689 100644
--- a/courgette/courgette_lib.target.linux-mips.mk
+++ b/courgette/courgette_lib.target.linux-mips.mk
@@ -103,6 +103,7 @@ MY_DEFS_Debug := \
'-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \
'-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \
'-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \
+ '-DDATA_REDUCTION_PROXY_WARMUP_URL="http://www.gstatic.com/generate_204"' \
'-DVIDEO_HOLE=1' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
@@ -197,6 +198,7 @@ MY_DEFS_Release := \
'-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \
'-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \
'-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \
+ '-DDATA_REDUCTION_PROXY_WARMUP_URL="http://www.gstatic.com/generate_204"' \
'-DVIDEO_HOLE=1' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
diff --git a/courgette/courgette_lib.target.linux-x86.mk b/courgette/courgette_lib.target.linux-x86.mk
index 3768c8cc17..e521dc3f70 100644
--- a/courgette/courgette_lib.target.linux-x86.mk
+++ b/courgette/courgette_lib.target.linux-x86.mk
@@ -104,6 +104,7 @@ MY_DEFS_Debug := \
'-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \
'-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \
'-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \
+ '-DDATA_REDUCTION_PROXY_WARMUP_URL="http://www.gstatic.com/generate_204"' \
'-DVIDEO_HOLE=1' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
@@ -198,6 +199,7 @@ MY_DEFS_Release := \
'-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \
'-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \
'-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \
+ '-DDATA_REDUCTION_PROXY_WARMUP_URL="http://www.gstatic.com/generate_204"' \
'-DVIDEO_HOLE=1' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
diff --git a/courgette/courgette_lib.target.linux-x86_64.mk b/courgette/courgette_lib.target.linux-x86_64.mk
index 37946694e1..29c2c8a5e1 100644
--- a/courgette/courgette_lib.target.linux-x86_64.mk
+++ b/courgette/courgette_lib.target.linux-x86_64.mk
@@ -103,6 +103,7 @@ MY_DEFS_Debug := \
'-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \
'-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \
'-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \
+ '-DDATA_REDUCTION_PROXY_WARMUP_URL="http://www.gstatic.com/generate_204"' \
'-DVIDEO_HOLE=1' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
@@ -196,6 +197,7 @@ MY_DEFS_Release := \
'-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \
'-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \
'-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \
+ '-DDATA_REDUCTION_PROXY_WARMUP_URL="http://www.gstatic.com/generate_204"' \
'-DVIDEO_HOLE=1' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-14 00:05:17 +0000