diff options
| author | Android Chromium Automerger <chromium-automerger@android> | 2014-06-19 03:36:26 +0000 |
|---|---|---|
| committer | Android Chromium Automerger <chromium-automerger@android> | 2014-06-19 03:36:26 +0000 |
| commit | a537a45691ec6cdddbc7c6ef136371fd29eed4a0 (patch) | |
| tree | 31053628e321368c369a32903f95714762b84c41 /ft2.target.linux-x86.mk | |
| parent | 3dc2a3cd8d98274cf0a76e566edc2a578ca0ba2d (diff) | |
| download | freetype-a537a45691ec6cdddbc7c6ef136371fd29eed4a0.tar.gz | |
Update makefiles after merge of Chromium at 278252
This commit was generated by merge_from_chromium.py.
Change-Id: I243fa0a891270c1726b859862b1b43571196eefa
Diffstat (limited to 'ft2.target.linux-x86.mk')
| -rw-r--r-- | ft2.target.linux-x86.mk | 2 |
1 files changed, 2 insertions, 0 deletions
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' \ |