From 542bf24a69172067524bee43954955fd5b6d2341 Mon Sep 17 00:00:00 2001 From: "hclam@chromium.org" Date: Fri, 11 Jun 2010 23:08:17 +0000 Subject: Enable remoting unittests to run on build bots Renamed chromoting.gyp to remoting.gyp. Also enabled remoting_unittests to be executed on the build bots. Review URL: http://codereview.chromium.org/2720007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@49609 0039d316-1c4b-4281-b951-d872f2087c98 --- build/common.gypi | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'build/common.gypi') diff --git a/build/common.gypi b/build/common.gypi index dcafee7..e449de0 100644 --- a/build/common.gypi +++ b/build/common.gypi @@ -112,8 +112,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, + # Remoting compilation is enabled by default. Set to 0 to disable. + 'remoting%': 1, }, # Define branding and buildtype on the basis of their settings within the @@ -132,7 +132,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. @@ -410,8 +410,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'], -- cgit v1.1