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

Unified Diff: webrtc/build/common.gypi

Issue 1677693002: Set use_gtk=0 as default for Chromium builds. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Updated comment Created 4 years, 10 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 | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/build/common.gypi
diff --git a/webrtc/build/common.gypi b/webrtc/build/common.gypi
index 67d5c81313967627888428ab8f7c901648acdf2a..3ce1b2fc570fcffbc080db743ef8ca12182821d8 100644
--- a/webrtc/build/common.gypi
+++ b/webrtc/build/common.gypi
@@ -121,9 +121,6 @@
# TODO(henrika): add support for Open SL ES.
'enable_android_opensl%': 0,
- # Disable this to skip building source requiring GTK.
- 'use_gtk%': 1,
-
# Link-Time Optimizations
# Executes code generation at link-time instead of compile-time
# https://gcc.gnu.org/wiki/LinkTimeOptimization
@@ -164,6 +161,9 @@
}],
['build_with_chromium==1', {
+ # Build sources requiring GTK. NOTICE: This is not present in Chrome OS
+ # build environments, even if available for Chromium builds.
+ 'use_gtk%': 0,
# Exclude pulse audio on Chromium since its prerequisites don't require
# pulse audio.
'include_pulse_audio%': 0,
@@ -175,6 +175,7 @@
'include_tests%': 0,
'restrict_webrtc_logging%': 1,
}, { # Settings for the standalone (not-in-Chromium) build.
+ 'use_gtk%': 1,
# TODO(andrew): For now, disable the Chrome plugins, which causes a
# flood of chromium-style warnings. Investigate enabling them:
# http://code.google.com/p/webrtc/issues/detail?id=163
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698