commit adda09e50de65c9a17d8d24dbbb421d39da1fe00
author Android Chromium Automerger <chromium-automerger@android> Tue Jun 10 23:37:15 2014 +0000
committer Android Chromium Automerger <chromium-automerger@android> Tue Jun 10 23:37:15 2014 +0000
tree 67387422a76c62f40e7d4e69a084472a26e074dc
parent bdcde22f1a453879ef002dde305d74f360e8b42b

Update makefiles after merge of Chromium at 276202

This commit was generated by merge_from_chromium.py.

Change-Id: I00be1885a20e1c8d4e5758fa281dca19d3ba4407

modules/audio_conference_mixer.target.darwin-arm.mk

diff --git a/modules/audio_conference_mixer.target.darwin-arm.mk b/modules/audio_conference_mixer.target.darwin-arm.mk
index a9818e9..adeaace 100644
--- a/modules/audio_conference_mixer.target.darwin-arm.mk
+++ b/modules/audio_conference_mixer.target.darwin-arm.mk
@@ -89,6 +89,7 @@
 	'-DUSE_LIBJPEG_TURBO=1' \
 	'-DENABLE_WEBRTC=1' \
 	'-DUSE_PROPRIETARY_CODECS' \
+	'-DENABLE_BROWSER_CDMS' \
 	'-DENABLE_CONFIGURATION_POLICY' \
 	'-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \
 	'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
@@ -209,6 +210,7 @@
 	'-DUSE_LIBJPEG_TURBO=1' \
 	'-DENABLE_WEBRTC=1' \
 	'-DUSE_PROPRIETARY_CODECS' \
+	'-DENABLE_BROWSER_CDMS' \
 	'-DENABLE_CONFIGURATION_POLICY' \
 	'-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \
 	'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \