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

Unified Diff: build/common.gypi

Issue 2720007: Enable remoting unittests to run on build bots (Closed)
Patch Set: done again Created 10 years, 6 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 | « build/all.gyp ('k') | chrome/chrome_tests.gypi » ('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 07f06149bd31b97d212b04b4dcdbe6782ed5972d..e4e37191e0eb58ccf163cb920b5c06374e20344c 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -110,8 +110,8 @@
# On Linux, we build with sse2 for Chromium builds.
'disable_sse2%': 0,
- # Chromoting compilation is enabled by default. Set to 0 to disable.
- 'chromoting%': 1,
+ # Reomoting compilation is enabled by default. Set to 0 to disable.
Sergey Ulanov 2010/06/11 20:42:09 Typo. Remoting
+ 'remoting%': 1,
},
# Define branding and buildtype on the basis of their settings within the
@@ -130,7 +130,7 @@
'arm_neon%': '<(arm_neon)',
'sysroot%': '<(sysroot)',
'disable_sse2%': '<(disable_sse2)',
- 'chromoting%': '<(chromoting)',
+ 'remoting%': '<(remoting)',
# The release channel that this build targets. This is used to restrict
# channel-specific build options, like which installer packages to create.
@@ -408,8 +408,8 @@
['chromeos==1', {
'defines': ['OS_CHROMEOS=1'],
}],
- ['chromoting==1', {
- 'defines': ['ENABLE_CHROMOTING=1'],
+ ['remoting==1', {
+ 'defines': ['ENABLE_REMOTING=1'],
}],
['proprietary_codecs==1', {
'defines': ['USE_PROPRIETARY_CODECS'],
« no previous file with comments | « build/all.gyp ('k') | chrome/chrome_tests.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698