Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1748)

Unified Diff: build/common.gypi

Issue 201563005: Revert r253110: "Enable webrtc for webview." (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « android_webview/lib/main/aw_main_delegate.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/common.gypi
diff --git a/build/common.gypi b/build/common.gypi
index 72eb96d94c07528ee98e90e0bdf56958f8bef7b5..0c1d5c7971ef26acb192cd43c3bbbdb301ddc5aa 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -648,10 +648,17 @@
'enable_autofill_dialog%': 1
}],
- ['OS=="android"', {
+ ['OS=="android" and android_webview_build==0', {
'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,
« no previous file with comments | « android_webview/lib/main/aw_main_delegate.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698