From a537a45691ec6cdddbc7c6ef136371fd29eed4a0 Mon Sep 17 00:00:00 2001 From: Android Chromium Automerger Date: Thu, 19 Jun 2014 03:36:26 +0000 Subject: Update makefiles after merge of Chromium at 278252 This commit was generated by merge_from_chromium.py. Change-Id: I243fa0a891270c1726b859862b1b43571196eefa --- ft2.target.linux-x86.mk | 2 ++ 1 file changed, 2 insertions(+) (limited to 'ft2.target.linux-x86.mk') diff --git a/ft2.target.linux-x86.mk b/ft2.target.linux-x86.mk index 80722db..ccd4668 100644 --- a/ft2.target.linux-x86.mk +++ b/ft2.target.linux-x86.mk @@ -106,6 +106,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' \ '-DFT2_BUILD_LIBRARY' \ '-DDARWIN_NO_CARBON' \ @@ -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' \ '-DFT2_BUILD_LIBRARY' \ '-DDARWIN_NO_CARBON' \ -- cgit v1.2.3