summaryrefslogtreecommitdiff
path: root/libvpx_obj_int_extract.host.linux-x86.mk
diff options
context:
space:
mode:
authorAndroid Chromium Automerger <chromium-automerger@android>2014-04-04 01:24:19 +0000
committerAndroid Chromium Automerger <chromium-automerger@android>2014-04-04 01:24:19 +0000
commitc4ae3a731f4de0fb3d09d20e1427fc96e879411d (patch)
tree488478b06db3a3b550b96a847545f06832da1712 /libvpx_obj_int_extract.host.linux-x86.mk
parent27588ce1bd6bc635269a6f02ec320480e347c062 (diff)
downloadlibvpx-c4ae3a731f4de0fb3d09d20e1427fc96e879411d.tar.gz
Update makefiles after merge of Chromium at 261622
This commit was generated by merge_from_chromium.py. Change-Id: Ia3125ab69b96cadc81fe8333b912dfbf7d61f75b
Diffstat (limited to 'libvpx_obj_int_extract.host.linux-x86.mk')
-rw-r--r--libvpx_obj_int_extract.host.linux-x86.mk2
1 files changed, 2 insertions, 0 deletions
diff --git a/libvpx_obj_int_extract.host.linux-x86.mk b/libvpx_obj_int_extract.host.linux-x86.mk
index f104172..7e7fcfa 100644
--- a/libvpx_obj_int_extract.host.linux-x86.mk
+++ b/libvpx_obj_int_extract.host.linux-x86.mk
@@ -55,6 +55,7 @@ MY_DEFS_Debug := \
'-DDISABLE_NACL' \
'-DCHROMIUM_BUILD' \
'-DUSE_LIBJPEG_TURBO=1' \
+ '-DUSE_MOJO=1' \
'-DENABLE_WEBRTC=1' \
'-DUSE_PROPRIETARY_CODECS' \
'-DENABLE_CONFIGURATION_POLICY' \
@@ -116,6 +117,7 @@ MY_DEFS_Release := \
'-DDISABLE_NACL' \
'-DCHROMIUM_BUILD' \
'-DUSE_LIBJPEG_TURBO=1' \
+ '-DUSE_MOJO=1' \
'-DENABLE_WEBRTC=1' \
'-DUSE_PROPRIETARY_CODECS' \
'-DENABLE_CONFIGURATION_POLICY' \