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

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: simplify chrome_exe.gypi 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
« no previous file with comments | « chrome/installer/util/util_constants.cc ('k') | chrome/nacl/broker_thread.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 48 matching lines...) Expand 10 before | Expand all | Expand 10 after
59 'type': 'static_library', 59 'type': 'static_library',
60 'variables': { 60 'variables': {
61 'nacl_target': 1, 61 'nacl_target': 1,
62 'irt_build_cmd': [ 62 'irt_build_cmd': [
63 'python', 'build_nacl_irt.py', '--outdir', '<(PRODUCT_DIR)', 63 'python', 'build_nacl_irt.py', '--outdir', '<(PRODUCT_DIR)',
64 ], 64 ],
65 'irt_inputs_cmd': 65 'irt_inputs_cmd':
66 'python build_nacl_irt.py --inputs', 66 'python build_nacl_irt.py --inputs',
67 }, 67 },
68 'dependencies': [ 68 'dependencies': [
69 # TODO(gregoryd): chrome_resources and chrome_strings could be
70 # shared with the 64-bit target, but it does not work due to a gyp
71 #issue
72 'chrome_resources', 69 'chrome_resources',
73 'chrome_strings', 70 'chrome_strings',
74 'common', 71 'common',
75 '../webkit/support/webkit_support.gyp:glue', 72 '../webkit/support/webkit_support.gyp:glue',
76 '../ppapi/native_client/src/trusted/plugin/plugin.gyp:ppGoogleNaClPlugin Chrome', 73 '../ppapi/native_client/src/trusted/plugin/plugin.gyp:ppGoogleNaClPlugin Chrome',
77 '../native_client/src/trusted/service_runtime/service_runtime.gyp:sel', 74 '../native_client/src/trusted/service_runtime/service_runtime.gyp:sel',
78 '../native_client/src/trusted/platform_qualify/platform_qualify.gyp:plat form_qual_lib', 75 '../native_client/src/trusted/platform_qualify/platform_qualify.gyp:plat form_qual_lib',
79 ], 76 ],
80 'direct_dependent_settings': { 77 'direct_dependent_settings': {
81 'defines': [ 78 'defines': [
(...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after
142 'conditions': [ 139 'conditions': [
143 ['OS=="win"', { 140 ['OS=="win"', {
144 'targets': [ 141 'targets': [
145 { 142 {
146 'target_name': 'nacl_win64', 143 'target_name': 'nacl_win64',
147 'type': 'static_library', 144 'type': 'static_library',
148 'variables': { 145 'variables': {
149 'nacl_target': 1, 146 'nacl_target': 1,
150 }, 147 },
151 'dependencies': [ 148 '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', 149 '../native_client/src/trusted/service_runtime/service_runtime.gyp:se l64',
159 '../native_client/src/trusted/platform_qualify/platform_qualify.gyp: platform_qual_lib64', 150 '../native_client/src/trusted/platform_qualify/platform_qualify.gyp: platform_qual_lib64',
160 ], 151 ],
161 'sources': [ 152 'sources': [
162 'nacl/broker_thread.cc', 153 'common/nacl_cmd_line.cc',
163 'nacl/broker_thread.h', 154 'common/nacl_messages.cc',
155 'nacl/nacl_broker_listener.cc',
156 'nacl/nacl_broker_listener.h',
157 ],
158 'include_dirs': [
159 '..',
164 ], 160 ],
165 'defines': [ 161 'defines': [
166 '<@(nacl_win64_defines)', 162 '<@(nacl_win64_defines)',
167 ], 163 ],
168 'configurations': { 164 'configurations': {
169 'Common_Base': { 165 'Common_Base': {
170 'msvs_target_platform': 'x64', 166 'msvs_target_platform': 'x64',
171 }, 167 },
172 }, 168 },
173 'direct_dependent_settings': { 169 'direct_dependent_settings': {
(...skipping 163 matching lines...) Expand 10 before | Expand all | Expand 10 after
337 '<(PRODUCT_DIR)/nacl_helper_bootstrap_raw'], 333 '<(PRODUCT_DIR)/nacl_helper_bootstrap_raw'],
338 'outputs': ['<(PRODUCT_DIR)/nacl_helper_bootstrap'], 334 'outputs': ['<(PRODUCT_DIR)/nacl_helper_bootstrap'],
339 'message': 'Munging ELF program header', 335 'message': 'Munging ELF program header',
340 'action': ['python', '<@(_inputs)', '<@(_outputs)'] 336 'action': ['python', '<@(_inputs)', '<@(_outputs)']
341 }], 337 }],
342 }, 338 },
343 ], 339 ],
344 }], 340 }],
345 ], 341 ],
346 } 342 }
OLDNEW
« no previous file with comments | « chrome/installer/util/util_constants.cc ('k') | chrome/nacl/broker_thread.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698