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

Unified Diff: build/common.gypi

Issue 6174005: Fix compilation with disabled remoting. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 11 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 | chrome/browser/resources/options/advanced_options.html » ('j') | 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 ae5f41a7e206bc8bb5d216d3e4cdc6dbc604c45d..6215c51d5145bdd0d36550376550d327d50fcee2 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -119,6 +119,9 @@
# Set to select the Title Case versions of strings in GRD files.
'use_titlecase_in_grd_files%': 0,
+ # Remoting compilation is enabled by default. Set to 0 to disable.
+ 'remoting%': 1,
+
'conditions': [
# A flag to enable or disable our compile-time dependency
# on gnome-keyring. If that dependency is disabled, no gnome-keyring
@@ -173,6 +176,7 @@
'library%': '<(library)',
'component%': '<(component)',
'use_titlecase_in_grd_files%': '<(use_titlecase_in_grd_files)',
+ 'remoting%': '<(remoting)',
# The release channel that this build targets. This is used to restrict
# channel-specific build options, like which installer packages to create.
@@ -333,9 +337,6 @@
# from the system include dirs.
'system_libcros%': 0,
- # Remoting compilation is enabled by default. Set to 0 to disable.
- 'remoting%': 1,
-
# NOTE: When these end up in the Mac bundle, we need to replace '-' for '_'
# so Cocoa is happy (http://crbug.com/20441).
'locales': [
@@ -449,6 +450,9 @@
['touchui==1', {
'grit_defines': ['-D', 'touchui'],
}],
+ ['remoting==1', {
+ 'grit_defines': ['-D', 'remoting'],
+ }],
['use_titlecase_in_grd_files==1', {
'grit_defines': ['-D', 'use_titlecase'],
}],
« no previous file with comments | « no previous file | chrome/browser/resources/options/advanced_options.html » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698