diff options
| author | Torne (Richard Coles) <torne@google.com> | 2014-05-16 13:15:58 +0100 |
|---|---|---|
| committer | Torne (Richard Coles) <torne@google.com> | 2014-05-16 13:15:58 +0100 |
| commit | b24fe9f4fffcbeaaa54410dec01e9598dbaf9066 (patch) | |
| tree | 231384d5d760ada776dcfd046729c9e06a674cfa /ft2.target.linux-x86.mk | |
| parent | 8c576bb549fb2757854c2827ab953b2338c0d1cf (diff) | |
| download | freetype-b24fe9f4fffcbeaaa54410dec01e9598dbaf9066.tar.gz | |
Update makefiles after merge of Chromium at 270770
This commit was generated by merge_from_chromium.py.
Change-Id: I6ef68716be59dcb826e40419343a57ef5b7b3461
Diffstat (limited to 'ft2.target.linux-x86.mk')
| -rw-r--r-- | ft2.target.linux-x86.mk | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/ft2.target.linux-x86.mk b/ft2.target.linux-x86.mk index 8b12d05..5ddff96 100644 --- a/ft2.target.linux-x86.mk +++ b/ft2.target.linux-x86.mk @@ -100,6 +100,10 @@ MY_DEFS_Debug := \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \ + '-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"' \ '-DVIDEO_HOLE=1' \ '-DFT2_BUILD_LIBRARY' \ '-DDARWIN_NO_CARBON' \ @@ -195,6 +199,10 @@ MY_DEFS_Release := \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \ + '-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"' \ '-DVIDEO_HOLE=1' \ '-DFT2_BUILD_LIBRARY' \ '-DDARWIN_NO_CARBON' \ |