diff options
author | Android Chromium Automerger <chromium-automerger@android> | 2014-06-19 03:36:30 +0000 |
---|---|---|
committer | Android Chromium Automerger <chromium-automerger@android> | 2014-06-19 03:36:30 +0000 |
commit | 7d55a202b5b6e612e834e62e5b6220ddff4b885d (patch) | |
tree | 3520ec62b7ebb1dea4f8a012aee1ae10d9eb7d1b | |
parent | dbfa6f176cf1231315829678beadfe1ec7028d4c (diff) | |
download | ots-7d55a202b5b6e612e834e62e5b6220ddff4b885d.tar.gz |
Update makefiles after merge of Chromium at 278252
This commit was generated by merge_from_chromium.py.
Change-Id: I3ae4606997ac1de6ee3c11a86355ea0809a1f1fe
-rw-r--r-- | ots.target.darwin-arm.mk | 2 | ||||
-rw-r--r-- | ots.target.darwin-arm64.mk | 2 | ||||
-rw-r--r-- | ots.target.darwin-mips.mk | 2 | ||||
-rw-r--r-- | ots.target.darwin-x86.mk | 2 | ||||
-rw-r--r-- | ots.target.darwin-x86_64.mk | 2 | ||||
-rw-r--r-- | ots.target.linux-arm.mk | 2 | ||||
-rw-r--r-- | ots.target.linux-arm64.mk | 2 | ||||
-rw-r--r-- | ots.target.linux-mips.mk | 2 | ||||
-rw-r--r-- | ots.target.linux-x86.mk | 2 | ||||
-rw-r--r-- | ots.target.linux-x86_64.mk | 2 |
10 files changed, 20 insertions, 0 deletions
diff --git a/ots.target.darwin-arm.mk b/ots.target.darwin-arm.mk index 79ff91b..2d08b34 100644 --- a/ots.target.darwin-arm.mk +++ b/ots.target.darwin-arm.mk @@ -120,6 +120,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' \ @@ -220,6 +221,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/ots.target.darwin-arm64.mk b/ots.target.darwin-arm64.mk index 8d4ef26..e40c8f9 100644 --- a/ots.target.darwin-arm64.mk +++ b/ots.target.darwin-arm64.mk @@ -110,6 +110,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' \ @@ -199,6 +200,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/ots.target.darwin-mips.mk b/ots.target.darwin-mips.mk index f85274f..bd4c2c8 100644 --- a/ots.target.darwin-mips.mk +++ b/ots.target.darwin-mips.mk @@ -114,6 +114,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' \ @@ -208,6 +209,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/ots.target.darwin-x86.mk b/ots.target.darwin-x86.mk index 84ca781..f445a2a 100644 --- a/ots.target.darwin-x86.mk +++ b/ots.target.darwin-x86.mk @@ -115,6 +115,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/ots.target.darwin-x86_64.mk b/ots.target.darwin-x86_64.mk index 30d1ac9..62bb57a 100644 --- a/ots.target.darwin-x86_64.mk +++ b/ots.target.darwin-x86_64.mk @@ -114,6 +114,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' \ @@ -207,6 +208,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/ots.target.linux-arm.mk b/ots.target.linux-arm.mk index 79ff91b..2d08b34 100644 --- a/ots.target.linux-arm.mk +++ b/ots.target.linux-arm.mk @@ -120,6 +120,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' \ @@ -220,6 +221,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/ots.target.linux-arm64.mk b/ots.target.linux-arm64.mk index 8d4ef26..e40c8f9 100644 --- a/ots.target.linux-arm64.mk +++ b/ots.target.linux-arm64.mk @@ -110,6 +110,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' \ @@ -199,6 +200,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/ots.target.linux-mips.mk b/ots.target.linux-mips.mk index f85274f..bd4c2c8 100644 --- a/ots.target.linux-mips.mk +++ b/ots.target.linux-mips.mk @@ -114,6 +114,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' \ @@ -208,6 +209,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/ots.target.linux-x86.mk b/ots.target.linux-x86.mk index 84ca781..f445a2a 100644 --- a/ots.target.linux-x86.mk +++ b/ots.target.linux-x86.mk @@ -115,6 +115,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/ots.target.linux-x86_64.mk b/ots.target.linux-x86_64.mk index 30d1ac9..62bb57a 100644 --- a/ots.target.linux-x86_64.mk +++ b/ots.target.linux-x86_64.mk @@ -114,6 +114,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' \ @@ -207,6 +208,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' \ |