diff options
| author | Android Chromium Automerger <chromium-automerger@android> | 2014-03-12 09:46:44 +0000 |
|---|---|---|
| committer | Android Chromium Automerger <chromium-automerger@android> | 2014-03-12 09:46:44 +0000 |
| commit | f921b731a2b52e3e47e25bce43e196b2b7907b77 (patch) | |
| tree | 867ea65540852bcdf6f197188cf555e8a7e5d052 /libvpx_obj_int_extract.host.linux-x86.mk | |
| parent | a5e4317596ac969b6b1316f3f8c1750cd7384e33 (diff) | |
| download | libvpx-f921b731a2b52e3e47e25bce43e196b2b7907b77.tar.gz | |
Update makefiles after merge of Chromium at 256489
This commit was generated by merge_from_chromium.py.
Change-Id: I663ce9592eddb5c59277d401b25d1a12b49981dd
Diffstat (limited to 'libvpx_obj_int_extract.host.linux-x86.mk')
| -rw-r--r-- | libvpx_obj_int_extract.host.linux-x86.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libvpx_obj_int_extract.host.linux-x86.mk b/libvpx_obj_int_extract.host.linux-x86.mk index abfa1c4..1325cfc 100644 --- a/libvpx_obj_int_extract.host.linux-x86.mk +++ b/libvpx_obj_int_extract.host.linux-x86.mk @@ -61,11 +61,11 @@ MY_DEFS_Debug := \ '-DENABLE_NEW_GAMEPAD_API=1' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ - '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DUSE_OPENSSL=1' \ '-DDYNAMIC_ANNOTATIONS_ENABLED=1' \ '-DWTF_USE_DYNAMIC_ANNOTATIONS=1' \ '-D_DEBUG' @@ -120,11 +120,11 @@ MY_DEFS_Release := \ '-DENABLE_NEW_GAMEPAD_API=1' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ - '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DUSE_OPENSSL=1' \ '-DNDEBUG' \ '-DNVALGRIND' \ '-DDYNAMIC_ANNOTATIONS_ENABLED=0' |