Modified: trunk/Source/WebKit/chromium/ChangeLog (138048 => 138049)
--- trunk/Source/WebKit/chromium/ChangeLog 2012-12-18 19:47:22 UTC (rev 138048)
+++ trunk/Source/WebKit/chromium/ChangeLog 2012-12-18 19:58:13 UTC (rev 138049)
@@ -1,3 +1,15 @@
+2012-12-18 Wei Jia <w...@chromium.org>
+
+ Enable media stream on Android for Chromium
+ https://bugs.webkit.org/show_bug.cgi?id=102545
+
+ Reviewed by Eric Seidel.
+
+ Put all webrtc related stuff under one flag "enable_webrtc" which is set to 1
+ on Linux/Windows/Mac and 0 on Android.
+
+ * features.gypi:
+
2012-12-18 Yaron Friedman <yfried...@chromium.org>
Chrome Android java output is too verbose
Modified: trunk/Source/WebKit/chromium/features.gypi (138048 => 138049)
--- trunk/Source/WebKit/chromium/features.gypi 2012-12-18 19:47:22 UTC (rev 138048)
+++ trunk/Source/WebKit/chromium/features.gypi 2012-12-18 19:58:13 UTC (rev 138049)
@@ -86,6 +86,7 @@
'ENABLE_MATHML=1',
'ENABLE_MEDIA_SOURCE=1',
'ENABLE_MEDIA_STATISTICS=1',
+ 'ENABLE_MEDIA_STREAM=<(enable_webrtc)',
'ENABLE_METER_ELEMENT=1',
'ENABLE_MHTML=1',
'ENABLE_MICRODATA=0',
@@ -168,7 +169,6 @@
'ENABLE_INPUT_TYPE_WEEK=0',
'ENABLE_LEGACY_NOTIFICATIONS=0',
'ENABLE_MEDIA_CAPTURE=1',
- 'ENABLE_MEDIA_STREAM=0',
'ENABLE_NOTIFICATIONS=0',
'ENABLE_ORIENTATION_EVENTS=1',
'ENABLE_PAGE_POPUP=0',
@@ -192,7 +192,6 @@
'ENABLE_INPUT_MULTIPLE_FIELDS_UI=1',
'ENABLE_LEGACY_NOTIFICATIONS=1',
'ENABLE_MEDIA_CAPTURE=0',
- 'ENABLE_MEDIA_STREAM=1',
'ENABLE_NOTIFICATIONS=1',
'ENABLE_ORIENTATION_EVENTS=0',
'ENABLE_PAGE_POPUP=1',
