From ad3bcf43404f06080840b0787fad7a394e7925d8 Mon Sep 17 00:00:00 2001 From: Android Chromium Automerger Date: Thu, 19 Jun 2014 03:36:33 +0000 Subject: Update makefiles after merge of Chromium at 278252 This commit was generated by merge_from_chromium.py. Change-Id: I2e09453759ef2a9b23eb8b2cf0d92f70acc3ea89 --- video_engine/video_engine_core.target.darwin-arm.mk | 2 ++ video_engine/video_engine_core.target.darwin-arm64.mk | 2 ++ video_engine/video_engine_core.target.darwin-mips.mk | 2 ++ video_engine/video_engine_core.target.darwin-x86.mk | 2 ++ video_engine/video_engine_core.target.darwin-x86_64.mk | 2 ++ video_engine/video_engine_core.target.linux-arm.mk | 2 ++ video_engine/video_engine_core.target.linux-arm64.mk | 2 ++ video_engine/video_engine_core.target.linux-mips.mk | 2 ++ video_engine/video_engine_core.target.linux-x86.mk | 2 ++ video_engine/video_engine_core.target.linux-x86_64.mk | 2 ++ 10 files changed, 20 insertions(+) (limited to 'video_engine') diff --git a/video_engine/video_engine_core.target.darwin-arm.mk b/video_engine/video_engine_core.target.darwin-arm.mk index 7e7e15de..03d56d9a 100644 --- a/video_engine/video_engine_core.target.darwin-arm.mk +++ b/video_engine/video_engine_core.target.darwin-arm.mk @@ -123,6 +123,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' \ '-DWEBRTC_RESTRICT_LOGGING' \ '-DWEBRTC_MODULE_UTILITY_VIDEO' \ @@ -241,6 +242,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' \ '-DWEBRTC_RESTRICT_LOGGING' \ '-DWEBRTC_MODULE_UTILITY_VIDEO' \ diff --git a/video_engine/video_engine_core.target.darwin-arm64.mk b/video_engine/video_engine_core.target.darwin-arm64.mk index 4f2208c5..7008757e 100644 --- a/video_engine/video_engine_core.target.darwin-arm64.mk +++ b/video_engine/video_engine_core.target.darwin-arm64.mk @@ -113,6 +113,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' \ '-DWEBRTC_RESTRICT_LOGGING' \ '-DWEBRTC_MODULE_UTILITY_VIDEO' \ @@ -217,6 +218,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' \ '-DWEBRTC_RESTRICT_LOGGING' \ '-DWEBRTC_MODULE_UTILITY_VIDEO' \ diff --git a/video_engine/video_engine_core.target.darwin-mips.mk b/video_engine/video_engine_core.target.darwin-mips.mk index 3971e705..9d1c00b3 100644 --- a/video_engine/video_engine_core.target.darwin-mips.mk +++ b/video_engine/video_engine_core.target.darwin-mips.mk @@ -118,6 +118,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' \ '-DWEBRTC_RESTRICT_LOGGING' \ '-DWEBRTC_MODULE_UTILITY_VIDEO' \ @@ -230,6 +231,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' \ '-DWEBRTC_RESTRICT_LOGGING' \ '-DWEBRTC_MODULE_UTILITY_VIDEO' \ diff --git a/video_engine/video_engine_core.target.darwin-x86.mk b/video_engine/video_engine_core.target.darwin-x86.mk index 726e770c..0dc101be 100644 --- a/video_engine/video_engine_core.target.darwin-x86.mk +++ b/video_engine/video_engine_core.target.darwin-x86.mk @@ -118,6 +118,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' \ '-DWEBRTC_RESTRICT_LOGGING' \ '-DWEBRTC_MODULE_UTILITY_VIDEO' \ @@ -227,6 +228,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' \ '-DWEBRTC_RESTRICT_LOGGING' \ '-DWEBRTC_MODULE_UTILITY_VIDEO' \ diff --git a/video_engine/video_engine_core.target.darwin-x86_64.mk b/video_engine/video_engine_core.target.darwin-x86_64.mk index fdc3919d..87070467 100644 --- a/video_engine/video_engine_core.target.darwin-x86_64.mk +++ b/video_engine/video_engine_core.target.darwin-x86_64.mk @@ -117,6 +117,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' \ '-DWEBRTC_RESTRICT_LOGGING' \ '-DWEBRTC_MODULE_UTILITY_VIDEO' \ @@ -225,6 +226,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' \ '-DWEBRTC_RESTRICT_LOGGING' \ '-DWEBRTC_MODULE_UTILITY_VIDEO' \ diff --git a/video_engine/video_engine_core.target.linux-arm.mk b/video_engine/video_engine_core.target.linux-arm.mk index 7e7e15de..03d56d9a 100644 --- a/video_engine/video_engine_core.target.linux-arm.mk +++ b/video_engine/video_engine_core.target.linux-arm.mk @@ -123,6 +123,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' \ '-DWEBRTC_RESTRICT_LOGGING' \ '-DWEBRTC_MODULE_UTILITY_VIDEO' \ @@ -241,6 +242,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' \ '-DWEBRTC_RESTRICT_LOGGING' \ '-DWEBRTC_MODULE_UTILITY_VIDEO' \ diff --git a/video_engine/video_engine_core.target.linux-arm64.mk b/video_engine/video_engine_core.target.linux-arm64.mk index 4f2208c5..7008757e 100644 --- a/video_engine/video_engine_core.target.linux-arm64.mk +++ b/video_engine/video_engine_core.target.linux-arm64.mk @@ -113,6 +113,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' \ '-DWEBRTC_RESTRICT_LOGGING' \ '-DWEBRTC_MODULE_UTILITY_VIDEO' \ @@ -217,6 +218,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' \ '-DWEBRTC_RESTRICT_LOGGING' \ '-DWEBRTC_MODULE_UTILITY_VIDEO' \ diff --git a/video_engine/video_engine_core.target.linux-mips.mk b/video_engine/video_engine_core.target.linux-mips.mk index 3971e705..9d1c00b3 100644 --- a/video_engine/video_engine_core.target.linux-mips.mk +++ b/video_engine/video_engine_core.target.linux-mips.mk @@ -118,6 +118,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' \ '-DWEBRTC_RESTRICT_LOGGING' \ '-DWEBRTC_MODULE_UTILITY_VIDEO' \ @@ -230,6 +231,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' \ '-DWEBRTC_RESTRICT_LOGGING' \ '-DWEBRTC_MODULE_UTILITY_VIDEO' \ diff --git a/video_engine/video_engine_core.target.linux-x86.mk b/video_engine/video_engine_core.target.linux-x86.mk index 726e770c..0dc101be 100644 --- a/video_engine/video_engine_core.target.linux-x86.mk +++ b/video_engine/video_engine_core.target.linux-x86.mk @@ -118,6 +118,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' \ '-DWEBRTC_RESTRICT_LOGGING' \ '-DWEBRTC_MODULE_UTILITY_VIDEO' \ @@ -227,6 +228,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' \ '-DWEBRTC_RESTRICT_LOGGING' \ '-DWEBRTC_MODULE_UTILITY_VIDEO' \ diff --git a/video_engine/video_engine_core.target.linux-x86_64.mk b/video_engine/video_engine_core.target.linux-x86_64.mk index fdc3919d..87070467 100644 --- a/video_engine/video_engine_core.target.linux-x86_64.mk +++ b/video_engine/video_engine_core.target.linux-x86_64.mk @@ -117,6 +117,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' \ '-DWEBRTC_RESTRICT_LOGGING' \ '-DWEBRTC_MODULE_UTILITY_VIDEO' \ @@ -225,6 +226,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' \ '-DWEBRTC_RESTRICT_LOGGING' \ '-DWEBRTC_MODULE_UTILITY_VIDEO' \ -- cgit v1.2.3