diff options
| -rw-r--r-- | build/common.gypi | 10 | ||||
| -rw-r--r-- | chrome/browser/resources/options/advanced_options.html | 2 | ||||
| -rw-r--r-- | chrome/chrome.gyp | 8 |
3 files changed, 15 insertions, 5 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'], }], diff --git a/chrome/browser/resources/options/advanced_options.html b/chrome/browser/resources/options/advanced_options.html index 997f4f2..c370bfa 100644 --- a/chrome/browser/resources/options/advanced_options.html +++ b/chrome/browser/resources/options/advanced_options.html @@ -200,6 +200,8 @@ </div> </div> </section> +</if> +<if expr="pp_ifdef('remoting') and not pp_ifdef('chromeos')"> <section id="remoting-section"> <h3 i18n-content="advancedSectionTitleRemoting"></h3> <div> diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp index 5095499..06be2e9 100644 --- a/chrome/chrome.gyp +++ b/chrome/chrome.gyp @@ -1170,9 +1170,13 @@ }], ['remoting==1', { 'dependencies': [ - '../remoting/remoting.gyp:chromoting_base', '../remoting/remoting.gyp:chromoting_host', - '../remoting/remoting.gyp:chromoting_jingle_glue', + ], + }], + ['remoting==0', { + 'sources!': [ + 'service/remoting/chromoting_host_manager.cc', + 'service/remoting/chromoting_host_manager.h', ], }], ], |