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

Side by Side Diff: chrome/nacl.gypi

Issue 7863024: Make the NaCl windows 64 bit binaries not depend on chrome targets. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: remove nacl_win64 and dummy hacks Created 9 years, 3 months 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) 2011 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2011 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 'target_defaults': { 6 'target_defaults': {
7 'variables': { 7 'variables': {
8 'nacl_target': 0, 8 'nacl_target': 0,
9 }, 9 },
10 'target_conditions': [ 10 'target_conditions': [
(...skipping 131 matching lines...) Expand 10 before | Expand all | Expand 10 after
142 'conditions': [ 142 'conditions': [
143 ['OS=="win"', { 143 ['OS=="win"', {
144 'targets': [ 144 'targets': [
145 { 145 {
146 'target_name': 'nacl_win64', 146 'target_name': 'nacl_win64',
147 'type': 'static_library', 147 'type': 'static_library',
148 'variables': { 148 'variables': {
149 'nacl_target': 1, 149 'nacl_target': 1,
150 }, 150 },
151 'dependencies': [ 151 'dependencies': [
152 # TODO(gregoryd): chrome_resources and chrome_strings could be
153 # shared with the 32-bit target, but it does not work due to a gyp
154 #issue
155 'chrome_resources',
156 'chrome_strings',
157 'common_nacl_win64',
158 '../native_client/src/trusted/service_runtime/service_runtime.gyp:se l64', 152 '../native_client/src/trusted/service_runtime/service_runtime.gyp:se l64',
159 '../native_client/src/trusted/platform_qualify/platform_qualify.gyp: platform_qual_lib64', 153 '../native_client/src/trusted/platform_qualify/platform_qualify.gyp: platform_qual_lib64',
160 ], 154 ],
161 'sources': [ 155 'sources': [
162 'nacl/broker_thread.cc', 156 'common/nacl_cmd_line.cc',
163 'nacl/broker_thread.h', 157 'common/nacl_messages.cc',
158 'nacl/nacl_broker_listener.cc',
159 'nacl/nacl_broker_listener.h',
160 ],
161 'include_dirs': [
162 '..',
164 ], 163 ],
165 'defines': [ 164 'defines': [
166 '<@(nacl_win64_defines)', 165 '<@(nacl_win64_defines)',
167 ], 166 ],
168 'configurations': { 167 'configurations': {
169 'Common_Base': { 168 'Common_Base': {
170 'msvs_target_platform': 'x64', 169 'msvs_target_platform': 'x64',
171 }, 170 },
172 }, 171 },
173 'direct_dependent_settings': { 172 'direct_dependent_settings': {
(...skipping 163 matching lines...) Expand 10 before | Expand all | Expand 10 after
337 '<(PRODUCT_DIR)/nacl_helper_bootstrap_raw'], 336 '<(PRODUCT_DIR)/nacl_helper_bootstrap_raw'],
338 'outputs': ['<(PRODUCT_DIR)/nacl_helper_bootstrap'], 337 'outputs': ['<(PRODUCT_DIR)/nacl_helper_bootstrap'],
339 'message': 'Munging ELF program header', 338 'message': 'Munging ELF program header',
340 'action': ['python', '<@(_inputs)', '<@(_outputs)'] 339 'action': ['python', '<@(_inputs)', '<@(_outputs)']
341 }], 340 }],
342 }, 341 },
343 ], 342 ],
344 }], 343 }],
345 ], 344 ],
346 } 345 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698