| Index: build/common.gypi | 
| diff --git a/build/common.gypi b/build/common.gypi | 
| index 594b9a21e6aeef80ccc4be111195fa9d5409f0d8..76cf67cf87f88f84edb0bafb86faa1cdd0a868c9 100644 | 
| --- a/build/common.gypi | 
| +++ b/build/common.gypi | 
| @@ -654,17 +654,10 @@ | 
| 'enable_autofill_dialog%': 1 | 
| }], | 
|  | 
| -        ['OS=="android" and android_webview_build==0', { | 
| +        ['OS=="android"', { | 
| 'enable_webrtc%': 1, | 
| }], | 
|  | 
| -        # Disable WebRTC for building WebView as part of Android system. | 
| -        # TODO(boliu): Decide if we want WebRTC, and if so, also merge | 
| -        # the necessary third_party repositories. | 
| -        ['OS=="android" and android_webview_build==1', { | 
| -          'enable_webrtc%': 0, | 
| -        }], | 
| - | 
| ['OS=="ios"', { | 
| 'disable_ftp_support%': 1, | 
| 'enable_automation%': 0, | 
|  |