diff options
| author | maruel@chromium.org <maruel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-16 20:42:39 +0000 |
|---|---|---|
| committer | maruel@chromium.org <maruel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-16 20:42:39 +0000 |
| commit | 0b7f7111811658085e91ccbfbc3c222c81b52a6c (patch) | |
| tree | 9566f040120257a4d85f203416398b07f50a745f /remoting/remoting.gyp | |
| parent | 0b3e8506f4b1d63cb54414b9462a85828855b926 (diff) | |
| download | chromium_src-0b7f7111811658085e91ccbfbc3c222c81b52a6c.zip chromium_src-0b7f7111811658085e91ccbfbc3c222c81b52a6c.tar.gz chromium_src-0b7f7111811658085e91ccbfbc3c222c81b52a6c.tar.bz2 | |
Stop using macros with space in them.
msbuild (VS2010) incorrectly mangles the command line for rc.exe when there is space in the defines; it double quotes it incorrectly. e.g. FOO="foo bar" becomes;
rc.exe /D "FOO="foo bar""
Note that VS2008 and cl.exe command line on msbuild are not affected.
BUG=107652
TEST=
Review URL: http://codereview.chromium.org/8954002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@114851 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting/remoting.gyp')
| -rw-r--r-- | remoting/remoting.gyp | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/remoting/remoting.gyp b/remoting/remoting.gyp index 5772e92..fbc65b8 100644 --- a/remoting/remoting.gyp +++ b/remoting/remoting.gyp @@ -9,6 +9,7 @@ 'chromium_code': 1, # Use consistent strings across all platforms. Note that the plugin name # is brand-dependent and is defined further down. + # Must match host/plugin/constants.h 'host_plugin_mime_type': 'application/vnd.chromium.remoting-host', 'host_plugin_description': 'Allow another user to access your computer securely over the Internet.', @@ -46,6 +47,7 @@ 'host_plugin_prefix': '', }], ['branding=="Chrome"', { + # Must match host/plugin/constants.h 'host_plugin_name': 'Chrome Remote Desktop Host', 'remoting_it2me_locale_files': [ 'webapp/me2mom/_locales.official/ar/messages.json', @@ -92,6 +94,7 @@ 'webapp/me2mom/_locales.official/zh_TW/messages.json', ], }, { # else: branding!="Chrome" + # Must match host/plugin/constants.h 'host_plugin_name': 'Chromoting Host', 'remoting_it2me_locale_files': [ 'webapp/me2mom/_locales/en/messages.json', @@ -275,11 +278,6 @@ 'variables': { 'enable_wexit_time_destructors': 1, }, 'product_extension': '<(host_plugin_extension)', 'product_prefix': '<(host_plugin_prefix)', - 'defines': [ - 'HOST_PLUGIN_MIME_TYPE="<(host_plugin_mime_type)"', - 'HOST_PLUGIN_NAME="<(host_plugin_name)"', - 'HOST_PLUGIN_DESCRIPTION="<(host_plugin_description)"', - ], 'dependencies': [ 'remoting_base', 'remoting_host', @@ -312,6 +310,9 @@ 'CHROMIUM_BUNDLE_ID': '<(mac_bundle_id)', 'INFOPLIST_FILE': 'host/plugin/host_plugin-Info.plist', 'INFOPLIST_PREPROCESS': 'YES', + # TODO(maruel): Use INFOPLIST_PREFIX_HEADER to remove the need to + # duplicate string once + # http://code.google.com/p/gyp/issues/detail?id=243 is fixed. 'INFOPLIST_PREPROCESSOR_DEFINITIONS': 'HOST_PLUGIN_MIME_TYPE="<(host_plugin_mime_type)" HOST_PLUGIN_NAME="<(host_plugin_name)" HOST_PLUGIN_DESCRIPTION="<(host_plugin_description)"', }, # TODO(mark): Come up with a fancier way to do this. It should |