summaryrefslogtreecommitdiff
path: root/common_audio/common_audio.target.darwin-x86.mk
diff options
context:
space:
mode:
authorAndroid Chromium Automerger <chromium-automerger@android>2014-04-04 01:24:22 +0000
committerAndroid Chromium Automerger <chromium-automerger@android>2014-04-04 01:24:22 +0000
commite111a22c86b4609993cc70cd41b11b8d02f53454 (patch)
tree41d4a0b7de3ab7871a9f96feff8c5fd8aa42bd56 /common_audio/common_audio.target.darwin-x86.mk
parent965e921cea1c7d32852b18fb65968bf71d5c9def (diff)
downloadwebrtc-e111a22c86b4609993cc70cd41b11b8d02f53454.tar.gz
Update makefiles after merge of Chromium at 261622
This commit was generated by merge_from_chromium.py. Change-Id: Ib42e3532b721e1ba8f5a8e00711f582337238590
Diffstat (limited to 'common_audio/common_audio.target.darwin-x86.mk')
-rw-r--r--common_audio/common_audio.target.darwin-x86.mk2
1 files changed, 2 insertions, 0 deletions
diff --git a/common_audio/common_audio.target.darwin-x86.mk b/common_audio/common_audio.target.darwin-x86.mk
index 0091e490..e5260ffc 100644
--- a/common_audio/common_audio.target.darwin-x86.mk
+++ b/common_audio/common_audio.target.darwin-x86.mk
@@ -118,6 +118,7 @@ MY_DEFS_Debug := \
'-DDISABLE_NACL' \
'-DCHROMIUM_BUILD' \
'-DUSE_LIBJPEG_TURBO=1' \
+ '-DUSE_MOJO=1' \
'-DENABLE_WEBRTC=1' \
'-DUSE_PROPRIETARY_CODECS' \
'-DENABLE_CONFIGURATION_POLICY' \
@@ -218,6 +219,7 @@ MY_DEFS_Release := \
'-DDISABLE_NACL' \
'-DCHROMIUM_BUILD' \
'-DUSE_LIBJPEG_TURBO=1' \
+ '-DUSE_MOJO=1' \
'-DENABLE_WEBRTC=1' \
'-DUSE_PROPRIETARY_CODECS' \
'-DENABLE_CONFIGURATION_POLICY' \