diff options
| author | sergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-11 00:53:18 +0000 |
|---|---|---|
| committer | sergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-11 00:53:18 +0000 |
| commit | 9a425422549b0dc33730e85bdae2fd441caa55da (patch) | |
| tree | 98be038f58d32a00a05864409654797804e093c6 /build/common.gypi | |
| parent | eae9c0623d1800201739b4be146649103a45cd93 (diff) | |
| download | chromium_src-9a425422549b0dc33730e85bdae2fd441caa55da.zip chromium_src-9a425422549b0dc33730e85bdae2fd441caa55da.tar.gz chromium_src-9a425422549b0dc33730e85bdae2fd441caa55da.tar.bz2 | |
Fix compilation with disabled remoting.
There are two issues fixed:
1. Code didn't compile.
2. The remoting section in option was shown even without --enable-remoting.
BUG=None
TEST=Try to compile with remoting=0 and verify that Remoting doesn't show up in advanced options
Review URL: http://codereview.chromium.org/6174005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@70976 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build/common.gypi')
| -rw-r--r-- | build/common.gypi | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/build/common.gypi b/build/common.gypi index ae5f41a..6215c51 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'], }], |