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

Side by Side Diff: ipc/ipc.gyp

Issue 103333004: Allow Win64 build of base library even in a Win32 build. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Base Win64: Replace existing base_nacl_win64 target with the new target. Created 7 years 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 { 5 {
6 'variables': { 6 'variables': {
7 'chromium_code': 1, 7 'chromium_code': 1,
8 }, 8 },
9 'includes': [ 9 'includes': [
10 'ipc.gypi', 10 'ipc.gypi',
(...skipping 138 matching lines...) Expand 10 before | Expand all | Expand 10 after
149 'conditions': [ 149 'conditions': [
150 ['OS=="win" and target_arch=="ia32"', { 150 ['OS=="win" and target_arch=="ia32"', {
151 'targets': [ 151 'targets': [
152 { 152 {
153 'target_name': 'ipc_win64', 153 'target_name': 'ipc_win64',
154 'type': '<(component)', 154 'type': '<(component)',
155 'variables': { 155 'variables': {
156 'ipc_target': 1, 156 'ipc_target': 1,
157 }, 157 },
158 'dependencies': [ 158 'dependencies': [
159 '../base/base.gyp:base_nacl_win64', 159 '../base/base.gyp:base_win64',
160 # TODO(viettrungluu): Needed for base/lazy_instance.h, which is 160 # TODO(viettrungluu): Needed for base/lazy_instance.h, which is
161 # suspect. 161 # suspect.
162 '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dyn amic_annotations_win64', 162 '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dyn amic_annotations_win64',
163 ], 163 ],
164 # TODO(gregoryd): direct_dependent_settings should be shared with the 164 # TODO(gregoryd): direct_dependent_settings should be shared with the
165 # 32-bit target, but it doesn't work due to a bug in gyp 165 # 32-bit target, but it doesn't work due to a bug in gyp
166 'direct_dependent_settings': { 166 'direct_dependent_settings': {
167 'include_dirs': [ 167 'include_dirs': [
168 '..', 168 '..',
169 ], 169 ],
(...skipping 19 matching lines...) Expand all
189 ], 189 ],
190 'variables': { 190 'variables': {
191 'test_suite_name': 'ipc_tests', 191 'test_suite_name': 'ipc_tests',
192 'input_shlib_path': '<(SHARED_LIB_DIR)/<(SHARED_LIB_PREFIX)ipc_tests <(SHARED_LIB_SUFFIX)', 192 'input_shlib_path': '<(SHARED_LIB_DIR)/<(SHARED_LIB_PREFIX)ipc_tests <(SHARED_LIB_SUFFIX)',
193 }, 193 },
194 'includes': [ '../build/apk_test.gypi' ], 194 'includes': [ '../build/apk_test.gypi' ],
195 }], 195 }],
196 }], 196 }],
197 ], 197 ],
198 } 198 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698