diff options
| author | petewil@chromium.org <petewil@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-09 18:48:05 +0000 |
|---|---|---|
| committer | petewil@chromium.org <petewil@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-09 18:48:05 +0000 |
| commit | ef1af5c3183fe154fa51ff89f71f0977b72ac3b4 (patch) | |
| tree | 5ce852b4b5391d03b4dd0189c9c84c4414fa8e56 /ppapi | |
| parent | 140cc3f38bf484809401e1bccba891c53f56491d (diff) | |
| download | chromium_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 'ppapi')
| -rw-r--r-- | ppapi/ppapi_internal.gyp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ppapi/ppapi_internal.gyp b/ppapi/ppapi_internal.gyp index 26bd9c4..989a591 100644 --- a/ppapi/ppapi_internal.gyp +++ b/ppapi/ppapi_internal.gyp @@ -224,7 +224,7 @@ }, 'dependencies': [ 'ppapi.gyp:ppapi_c', - '../base/base.gyp:base_nacl_win64', + '../base/base.gyp:base_win64', '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations_win64', '../ipc/ipc.gyp:ipc_win64', ], @@ -232,7 +232,7 @@ '<@(nacl_win64_defines)', ], 'export_dependent_settings': [ - '../base/base.gyp:base_nacl_win64', + '../base/base.gyp:base_win64', ], 'configurations': { 'Common_Base': { @@ -248,7 +248,7 @@ 'ppapi_ipc_target': 1, }, 'dependencies': [ - '../base/base.gyp:base_nacl_win64', + '../base/base.gyp:base_win64', '../ipc/ipc.gyp:ipc_win64', '../gpu/gpu.gyp:gpu_ipc_win64', 'ppapi.gyp:ppapi_c', |