summaryrefslogtreecommitdiffstats
path: root/courgette
diff options
context:
space:
mode:
authorpetewil@chromium.org <petewil@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-01-09 18:48:05 +0000
committerpetewil@chromium.org <petewil@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-01-09 18:48:05 +0000
commitef1af5c3183fe154fa51ff89f71f0977b72ac3b4 (patch)
tree5ce852b4b5391d03b4dd0189c9c84c4414fa8e56 /courgette
parent140cc3f38bf484809401e1bccba891c53f56491d (diff)
downloadchromium_src-ef1af5c3183fe154fa51ff89f71f0977b72ac3b4.zip
chromium_src-ef1af5c3183fe154fa51ff89f71f0977b72ac3b4.tar.gz
chromium_src-ef1af5c3183fe154fa51ff89f71f0977b72ac3b4.tar.bz2
Allow Win64 build of base library even in a Win32 build.
Some components of a 32 bit build of chrome for Windows need to be built as Win64 Dlls. To allow those components to use base, we make a Win64 build of the base library even when building chrome 32 bit. This is needed by the Chrome Desk Band code. crbug.com/327435. https://codereview.chromium.org/79173004/ BUG=327435 Review URL: https://codereview.chromium.org/103333004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@243936 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'courgette')
-rw-r--r--courgette/courgette.gyp4
1 files changed, 2 insertions, 2 deletions
diff --git a/courgette/courgette.gyp b/courgette/courgette.gyp
index 9de536f..fbd1ced 100644
--- a/courgette/courgette.gyp
+++ b/courgette/courgette.gyp
@@ -176,7 +176,7 @@
'target_name': 'courgette_lib64',
'type': 'static_library',
'dependencies': [
- '../base/base.gyp:base_nacl_win64',
+ '../base/base.gyp:base_win64',
'../third_party/lzma_sdk/lzma_sdk.gyp:lzma_sdk64',
],
'sources': [
@@ -196,7 +196,7 @@
],
'dependencies': [
'courgette_lib64',
- '../base/base.gyp:base_nacl_win64',
+ '../base/base.gyp:base_win64',
],
'configurations': {
'Common_Base': {