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

Side by Side Diff: chrome/nacl.gypi

Issue 7669058: Switching IRT to be built inside the chrome build. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 9 years, 4 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/build_nacl_irt.py ('k') | no next file » | 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 61 matching lines...) Expand 10 before | Expand all | Expand 10 after
72 '../native_client/src/trusted/service_runtime/service_runtime.gyp:sel', 72 '../native_client/src/trusted/service_runtime/service_runtime.gyp:sel',
73 '../native_client/src/trusted/platform_qualify/platform_qualify.gyp:plat form_qual_lib', 73 '../native_client/src/trusted/platform_qualify/platform_qualify.gyp:plat form_qual_lib',
74 ], 74 ],
75 'direct_dependent_settings': { 75 'direct_dependent_settings': {
76 'defines': [ 76 'defines': [
77 'NACL_BLOCK_SHIFT=5', 77 'NACL_BLOCK_SHIFT=5',
78 'NACL_BLOCK_SIZE=32', 78 'NACL_BLOCK_SIZE=32',
79 '<@(nacl_defines)', 79 '<@(nacl_defines)',
80 ], 80 ],
81 }, 81 },
82 'conditions': [ 82 'actions': [
83 ['target_arch=="ia32"', { 83 {
84 'copies': [ 84 'action_name': 'nacl_irt',
85 { 85 'message': 'Building NaCl IRT',
86 'destination': '<(PRODUCT_DIR)', 86 'variables': {
87 'files': [ 87 'irt_build_cmd': [
88 '../native_client/irt_binaries/nacl_irt_x86_32.nexe', 88 'python', 'build_nacl_irt.py', '--outdir', '<(PRODUCT_DIR)',
89 ], 89 ],
90 }, 90 'irt_inputs_cmd':
91 ], 91 'python build_nacl_irt.py --inputs',
92 }], 92 },
93 ['target_arch=="x64" or OS=="win"', { 93 'conditions': [
94 'copies': [ 94 ['OS=="win"', {
95 { 95 'inputs': [
96 'destination': '<(PRODUCT_DIR)', 96 '<!@(<(irt_inputs_cmd) --platform=x86-32 --platform=x86-64)',
97 'files': [ 97 ],
98 '../native_client/irt_binaries/nacl_irt_x86_64.nexe', 98 'outputs': ['<(PRODUCT_DIR)/nacl_irt_x86_32.nexe',
99 ], 99 '<(PRODUCT_DIR)/nacl_irt_x86_64.nexe'],
100 }, 100 'action': [
101 ], 101 '<@(irt_build_cmd)',
102 }], 102 '--platform', 'x86-32',
103 '--platform', 'x86-64',
104 ],
105 }, {
106 'conditions': [
107 ['target_arch=="ia32"', {
108 'inputs': [
109 '<!@(<(irt_inputs_cmd) --platform=x86-32)',
110 ],
111 'outputs': ['<(PRODUCT_DIR)/nacl_irt_x86_32.nexe'],
112 'action': [
113 '<@(irt_build_cmd)', '--platform', 'x86-32',
114 ],
115 }, { # target_arch=="x64"
116 'inputs': [
117 '<!@(<(irt_inputs_cmd) --platform=x86-64)',
118 ],
119 'outputs': ['<(PRODUCT_DIR)/nacl_irt_x86_64.nexe'],
120 'action': [
121 '<@(irt_build_cmd)', '--platform', 'x86-64',
122 ],
123 }],
124 ],
125 }],
126 ],
127 },
103 ], 128 ],
104 }, 129 },
105 ], 130 ],
106 'conditions': [ 131 'conditions': [
107 ['OS=="win"', { 132 ['OS=="win"', {
108 'targets': [ 133 'targets': [
109 { 134 {
110 'target_name': 'nacl_win64', 135 'target_name': 'nacl_win64',
111 'type': 'static_library', 136 'type': 'static_library',
112 'variables': { 137 'variables': {
(...skipping 81 matching lines...) Expand 10 before | Expand all | Expand 10 after
194 # reference nacl_helper as a shared library 219 # reference nacl_helper as a shared library
195 '<(PRODUCT_DIR)/nacl_helper.so', 220 '<(PRODUCT_DIR)/nacl_helper.so',
196 '-Wl,-rpath,<(SHARED_LIB_DIR)', 221 '-Wl,-rpath,<(SHARED_LIB_DIR)',
197 ], 222 ],
198 }, 223 },
199 }, 224 },
200 ], 225 ],
201 }], 226 }],
202 ], 227 ],
203 } 228 }
OLDNEW
« no previous file with comments | « chrome/build_nacl_irt.py ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698