diff options
| author | Torne (Richard Coles) <torne@google.com> | 2014-06-03 10:58:34 +0100 |
|---|---|---|
| committer | Torne (Richard Coles) <torne@google.com> | 2014-06-03 10:58:34 +0100 |
| commit | cedac228d2dd51db4b79ea1e72c7f249408ee061 (patch) | |
| tree | aa4ff43d7fe316e95d12721ce5e17653a768a0dd /gpu/gpu_ipc.target.darwin-x86.mk | |
| parent | 6a869ecff032b5bed299d661b078b0555034598b (diff) | |
| download | chromium_org-cedac228d2dd51db4b79ea1e72c7f249408ee061.tar.gz | |
Merge from Chromium at DEPS revision 273901
This commit was generated by merge_to_master.py.
Change-Id: I45745444894df927ffc1045ab8de88b9e52636a3
Diffstat (limited to 'gpu/gpu_ipc.target.darwin-x86.mk')
| -rw-r--r-- | gpu/gpu_ipc.target.darwin-x86.mk | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/gpu/gpu_ipc.target.darwin-x86.mk b/gpu/gpu_ipc.target.darwin-x86.mk index 761cbb2626..77fbe60587 100644 --- a/gpu/gpu_ipc.target.darwin-x86.mk +++ b/gpu/gpu_ipc.target.darwin-x86.mk @@ -40,6 +40,7 @@ MY_CFLAGS_Debug := \ -fvisibility=hidden \ -pipe \ -fPIC \ + -Wno-unused-local-typedefs \ -msse2 \ -mfpmath=sse \ -mmmx \ @@ -74,12 +75,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' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ @@ -128,6 +134,7 @@ MY_CFLAGS_Release := \ -fvisibility=hidden \ -pipe \ -fPIC \ + -Wno-unused-local-typedefs \ -msse2 \ -mfpmath=sse \ -mmmx \ @@ -162,12 +169,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' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ |