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 /android_webview/native/webview_native.target.darwin-x86_64.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 'android_webview/native/webview_native.target.darwin-x86_64.mk')
| -rw-r--r-- | android_webview/native/webview_native.target.darwin-x86_64.mk | 22 |
1 files changed, 18 insertions, 4 deletions
diff --git a/android_webview/native/webview_native.target.darwin-x86_64.mk b/android_webview/native/webview_native.target.darwin-x86_64.mk index 8d47519ad5..a50e212b3c 100644 --- a/android_webview/native/webview_native.target.darwin-x86_64.mk +++ b/android_webview/native/webview_native.target.darwin-x86_64.mk @@ -108,12 +108,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' \ '-DMOJO_USE_SYSTEM_IMPL' \ '-DPOSIX_AVOID_MMAP' \ @@ -124,10 +129,12 @@ MY_DEFS_Debug := \ '-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \ '-DGR_GL_IGNORE_ES3_MSAA=0' \ '-DSK_WILL_NEVER_DRAW_PERSPECTIVE_TEXT' \ - '-DSK_SUPPORT_LEGACY_PUBLICEFFECTCONSTRUCTORS=1' \ '-DSK_SUPPORT_LEGACY_GETTOPDEVICE' \ + '-DSK_SUPPORT_LEGACY_ASIMAGEINFO' \ '-DSK_SUPPORT_LEGACY_N32_NAME' \ - '-DSK_SUPPORT_LEGACY_BLURMASKFILTER_STYLE' \ + '-DSK_IGNORE_CORRECT_HIGH_QUALITY_IMAGE_SCALE' \ + '-DSK_SUPPORT_LEGACY_INSTALLPIXELSPARAMS' \ + '-DSK_SUPPORT_LEGACY_IMAGEGENERATORAPI' \ '-DSK_SUPPORT_LEGACY_GETTOTALCLIP' \ '-DSK_BUILD_FOR_ANDROID' \ '-DSK_USE_POSIX_THREADS' \ @@ -236,12 +243,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' \ '-DMOJO_USE_SYSTEM_IMPL' \ '-DPOSIX_AVOID_MMAP' \ @@ -252,10 +264,12 @@ MY_DEFS_Release := \ '-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \ '-DGR_GL_IGNORE_ES3_MSAA=0' \ '-DSK_WILL_NEVER_DRAW_PERSPECTIVE_TEXT' \ - '-DSK_SUPPORT_LEGACY_PUBLICEFFECTCONSTRUCTORS=1' \ '-DSK_SUPPORT_LEGACY_GETTOPDEVICE' \ + '-DSK_SUPPORT_LEGACY_ASIMAGEINFO' \ '-DSK_SUPPORT_LEGACY_N32_NAME' \ - '-DSK_SUPPORT_LEGACY_BLURMASKFILTER_STYLE' \ + '-DSK_IGNORE_CORRECT_HIGH_QUALITY_IMAGE_SCALE' \ + '-DSK_SUPPORT_LEGACY_INSTALLPIXELSPARAMS' \ + '-DSK_SUPPORT_LEGACY_IMAGEGENERATORAPI' \ '-DSK_SUPPORT_LEGACY_GETTOTALCLIP' \ '-DSK_BUILD_FOR_ANDROID' \ '-DSK_USE_POSIX_THREADS' \ |