From 6d86b77056ed63eb6871182f42a9fd5f07550f90 Mon Sep 17 00:00:00 2001 From: "Torne (Richard Coles)" Date: Wed, 25 Jun 2014 10:30:53 +0100 Subject: Merge from Chromium at DEPS revision 278856 This commit was generated by merge_to_master.py. Change-Id: If3807744d3e5d3ee84b897bd2d099a2b7ed2e7a3 --- .../native/input_stream_android_jar_jni_headers.target.linux-arm.mk | 2 ++ 1 file changed, 2 insertions(+) (limited to 'android_webview/native/input_stream_android_jar_jni_headers.target.linux-arm.mk') diff --git a/android_webview/native/input_stream_android_jar_jni_headers.target.linux-arm.mk b/android_webview/native/input_stream_android_jar_jni_headers.target.linux-arm.mk index 94422e0d87..cfccb03780 100644 --- a/android_webview/native/input_stream_android_jar_jni_headers.target.linux-arm.mk +++ b/android_webview/native/input_stream_android_jar_jni_headers.target.linux-arm.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' \ @@ -200,6 +201,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' \ -- cgit v1.2.3