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

Unified Diff: remoting/remoting.gyp

Issue 974673002: [Chromoting] Add remoting_options.gypi to share vars. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 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 | « remoting/app_remoting_webapp_build.gypi ('k') | remoting/remoting_options.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/remoting.gyp
diff --git a/remoting/remoting.gyp b/remoting/remoting.gyp
index 0f40d356663ce4fecd1cfe3fa22856c416d2875b..a0da127b13daf6e63ba6bea5fd0aaaca75fa24d5 100644
--- a/remoting/remoting.gyp
+++ b/remoting/remoting.gyp
@@ -4,27 +4,6 @@
{
'variables': {
- 'chromium_code': 1,
-
- # Set this to run the jscompile checks after building the webapp.
- 'run_jscompile%': 1,
-
- # Set this to enable cast mode on the android client.
- 'enable_cast%': 0,
-
- 'variables': {
- 'conditions': [
- # Enable the multi-process host on Windows by default.
- ['OS=="win"', {
- 'remoting_multi_process%': 1,
- }, {
- 'remoting_multi_process%': 0,
- }],
- ],
- },
-
- 'remoting_multi_process%': '<(remoting_multi_process)',
- 'remoting_rdp_session%': 1,
'branding_path': '../remoting/branding_<(branding)',
@@ -44,11 +23,6 @@
'<!(python -c "import uuid; print uuid.uuid5(uuid.UUID(\'655bd819-c08c-4b04-80c2-f160739ff6ef\'), \'<(version_full)\')")',
'rdp_desktop_session_clsid':
'<!(python -c "import uuid; print uuid.uuid5(uuid.UUID(\'6a7699f0-ee43-43e7-aa30-a6738f9bd470\'), \'<(version_full)\')")',
-
- # Java is not available on Windows bots, so we need to disable
- # JScompile checks.
- 'run_jscompile': 0,
-
}],
],
},
@@ -61,6 +35,7 @@
'remoting_host_srcs.gypi',
'remoting_key_tester.gypi',
'remoting_locales.gypi',
+ 'remoting_options.gypi',
'remoting_srcs.gypi',
'remoting_test.gypi',
'remoting_version.gypi',
« no previous file with comments | « remoting/app_remoting_webapp_build.gypi ('k') | remoting/remoting_options.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698