diff options
| author | Torne (Richard Coles) <torne@google.com> | 2014-06-03 10:59:12 +0100 |
|---|---|---|
| committer | Torne (Richard Coles) <torne@google.com> | 2014-06-03 10:59:12 +0100 |
| commit | b8afab0428e353c32334688ec78f864b1cc28c89 (patch) | |
| tree | edcdc52a33eb0fd2cbee66b62773c3596bf003f9 /ft2.target.linux-mips.mk | |
| parent | 52c290b2004ef94397da092c4e315900424635d7 (diff) | |
| parent | 0f774d123b76a767714e46dd82049af5478155ce (diff) | |
| download | freetype-b8afab0428e353c32334688ec78f864b1cc28c89.tar.gz | |
Merge from Chromium at DEPS revision 273901
This commit was generated by merge_to_master.py.
Change-Id: I6d2528edf9fe3246f921ce5858813fa4bc3b997d
Diffstat (limited to 'ft2.target.linux-mips.mk')
| -rw-r--r-- | ft2.target.linux-mips.mk | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/ft2.target.linux-mips.mk b/ft2.target.linux-mips.mk index ce436e8..1cf3d82 100644 --- a/ft2.target.linux-mips.mk +++ b/ft2.target.linux-mips.mk @@ -57,6 +57,7 @@ MY_CFLAGS_Debug := \ -fvisibility=hidden \ -pipe \ -fPIC \ + -Wno-unused-local-typedefs \ -Wno-format \ -EL \ -mhard-float \ @@ -94,12 +95,17 @@ MY_DEFS_Debug := \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DENABLE_NEW_GAMEPAD_API=1' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DENABLE_EGLIMAGE=1' \ '-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' \ @@ -153,6 +159,7 @@ MY_CFLAGS_Release := \ -fvisibility=hidden \ -pipe \ -fPIC \ + -Wno-unused-local-typedefs \ -Wno-format \ -EL \ -mhard-float \ @@ -190,12 +197,17 @@ MY_DEFS_Release := \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DENABLE_NEW_GAMEPAD_API=1' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DENABLE_EGLIMAGE=1' \ '-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' \ |