summaryrefslogtreecommitdiff
path: root/openssl.target.darwin-x86_64.mk
diff options
context:
space:
mode:
authorAndroid Chromium Automerger <chromium-automerger@android>2014-04-01 19:42:47 +0000
committerAndroid Chromium Automerger <chromium-automerger@android>2014-04-01 19:42:47 +0000
commitaf6dee235b8139cb8c054aa8c46aaa710e9e144b (patch)
tree6b3aff82a69016ee8016a77d22b0e1ec1c37098f /openssl.target.darwin-x86_64.mk
parent8b0d284e9ebdee96f41424d75341280c13554d93 (diff)
downloadopenssl-af6dee235b8139cb8c054aa8c46aaa710e9e144b.tar.gz
Update makefiles after merge of Chromium at 260927
This commit was generated by merge_from_chromium.py. Change-Id: Ib9ef722bb6b8b219845a4fb2a89f159176347d96
Diffstat (limited to 'openssl.target.darwin-x86_64.mk')
-rw-r--r--openssl.target.darwin-x86_64.mk2
1 files changed, 2 insertions, 0 deletions
diff --git a/openssl.target.darwin-x86_64.mk b/openssl.target.darwin-x86_64.mk
index 10491dd..86fee42 100644
--- a/openssl.target.darwin-x86_64.mk
+++ b/openssl.target.darwin-x86_64.mk
@@ -635,6 +635,7 @@ MY_DEFS_Debug := \
'-DDISABLE_NACL' \
'-DCHROMIUM_BUILD' \
'-DUSE_LIBJPEG_TURBO=1' \
+ '-DENABLE_WEBRTC=1' \
'-DUSE_PROPRIETARY_CODECS' \
'-DENABLE_CONFIGURATION_POLICY' \
'-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \
@@ -744,6 +745,7 @@ MY_DEFS_Release := \
'-DDISABLE_NACL' \
'-DCHROMIUM_BUILD' \
'-DUSE_LIBJPEG_TURBO=1' \
+ '-DENABLE_WEBRTC=1' \
'-DUSE_PROPRIETARY_CODECS' \
'-DENABLE_CONFIGURATION_POLICY' \
'-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \