diff options
| author | Torne (Richard Coles) <torne@google.com> | 2014-11-06 11:12:37 +0000 |
|---|---|---|
| committer | Torne (Richard Coles) <torne@google.com> | 2014-11-06 11:12:37 +0000 |
| commit | d79cb8cdf5a8090b3907d067cc572c11dc71c5ea (patch) | |
| tree | 907c80d36e8a2f5a69d96b1d35c4c6689e9ec914 /libvpx_asm_offsets_vpx_scale.target.darwin-arm.mk | |
| parent | 9c8bc1845e913af8743de098a40d4c8b69a6727d (diff) | |
| parent | 32a0cf4f842b1d152dda353e89bb0a5114b54a6c (diff) | |
| download | libvpx-d79cb8cdf5a8090b3907d067cc572c11dc71c5ea.tar.gz | |
Merge from Chromium at DEPS revision db3f05efe0f9
This commit was generated by merge_to_master.py.
Change-Id: I5ecd0c5a352c96b180972dd1dfdc96b32cf123e2
Diffstat (limited to 'libvpx_asm_offsets_vpx_scale.target.darwin-arm.mk')
| -rw-r--r-- | libvpx_asm_offsets_vpx_scale.target.darwin-arm.mk | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/libvpx_asm_offsets_vpx_scale.target.darwin-arm.mk b/libvpx_asm_offsets_vpx_scale.target.darwin-arm.mk index 45b8764..e843e40 100644 --- a/libvpx_asm_offsets_vpx_scale.target.darwin-arm.mk +++ b/libvpx_asm_offsets_vpx_scale.target.darwin-arm.mk @@ -81,14 +81,17 @@ MY_DEFS_Debug := \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DENABLE_NOTIFICATIONS' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ - '-DENABLE_EGLIMAGE=1' \ + '-DDONT_EMBED_BUILD_METADATA' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ + '-DENABLE_BASIC_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ '-DVIDEO_HOLE=1' \ '-DENABLE_LOAD_COMPLETION_HACKS=1' \ + '-DUSE_LIBPCI=1' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ '-DANDROID' \ @@ -179,14 +182,17 @@ MY_DEFS_Release := \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DENABLE_NOTIFICATIONS' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ - '-DENABLE_EGLIMAGE=1' \ + '-DDONT_EMBED_BUILD_METADATA' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ + '-DENABLE_BASIC_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ '-DVIDEO_HOLE=1' \ '-DENABLE_LOAD_COMPLETION_HACKS=1' \ + '-DUSE_LIBPCI=1' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ '-DANDROID' \ |