Update makefiles after merge of Chromium at 278252
This commit was generated by merge_from_chromium.py.
Change-Id: I243fa0a891270c1726b859862b1b43571196eefa
diff --git a/ft2.target.linux-arm64.mk b/ft2.target.linux-arm64.mk
index c95c4b3..c43d64b 100644
--- a/ft2.target.linux-arm64.mk
+++ b/ft2.target.linux-arm64.mk
@@ -101,6 +101,7 @@
'-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' \
@@ -198,6 +199,7 @@
'-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' \