commit e5d81f57cb97b3b6b7fccc9c5610d21eb81db09d
author Ben Murdoch <benm@google.com> Thu Apr 03 12:29:45 2014 +0100
committer Ben Murdoch <benm@google.com> Thu Apr 03 12:29:45 2014 +0100
tree f266aab56db899073b21c1edd1d0e00055b9a2cf
parent 67e8dac6e410a019f58fc452b262a184e8e7fd12

Merge from Chromium at DEPS revision 261286

This commit was generated by merge_to_master.py.

Change-Id: Iea9643ce91618057f128e9a5b62c07be152f2b89

net/http_server.target.linux-x86_64.mk

diff --git a/net/http_server.target.linux-x86_64.mk b/net/http_server.target.linux-x86_64.mk
index 6b87e65..a9deee9 100644
--- a/net/http_server.target.linux-x86_64.mk
+++ b/net/http_server.target.linux-x86_64.mk
@@ -74,6 +74,7 @@
 	'-DDISABLE_NACL' \
 	'-DCHROMIUM_BUILD' \
 	'-DUSE_LIBJPEG_TURBO=1' \
+	'-DENABLE_WEBRTC=1' \
 	'-DUSE_PROPRIETARY_CODECS' \
 	'-DENABLE_CONFIGURATION_POLICY' \
 	'-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \
@@ -162,6 +163,7 @@
 	'-DDISABLE_NACL' \
 	'-DCHROMIUM_BUILD' \
 	'-DUSE_LIBJPEG_TURBO=1' \
+	'-DENABLE_WEBRTC=1' \
 	'-DUSE_PROPRIETARY_CODECS' \
 	'-DENABLE_CONFIGURATION_POLICY' \
 	'-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \