diff options
| author | Android Chromium Automerger <chromium-automerger@android> | 2014-06-10 23:37:15 +0000 |
|---|---|---|
| committer | Android Chromium Automerger <chromium-automerger@android> | 2014-06-10 23:37:15 +0000 |
| commit | adda09e50de65c9a17d8d24dbbb421d39da1fe00 (patch) | |
| tree | 67387422a76c62f40e7d4e69a084472a26e074dc /webrtc_common.target.darwin-x86_64.mk | |
| parent | bdcde22f1a453879ef002dde305d74f360e8b42b (diff) | |
| download | webrtc-adda09e50de65c9a17d8d24dbbb421d39da1fe00.tar.gz | |
Update makefiles after merge of Chromium at 276202
This commit was generated by merge_from_chromium.py.
Change-Id: I00be1885a20e1c8d4e5758fa281dca19d3ba4407
Diffstat (limited to 'webrtc_common.target.darwin-x86_64.mk')
| -rw-r--r-- | webrtc_common.target.darwin-x86_64.mk | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/webrtc_common.target.darwin-x86_64.mk b/webrtc_common.target.darwin-x86_64.mk index c65a9c55..54a90b2b 100644 --- a/webrtc_common.target.darwin-x86_64.mk +++ b/webrtc_common.target.darwin-x86_64.mk @@ -76,6 +76,7 @@ MY_DEFS_Debug := \ '-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' \ @@ -179,6 +180,7 @@ MY_DEFS_Release := \ '-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' \ |