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

Side by Side Diff: chrome/nacl.gypi

Issue 7761004: Adding a special toolchain that will work with chromeos. (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
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 86 matching lines...) Expand 10 before | Expand all | Expand 10 after
97 'outputs': ['<(PRODUCT_DIR)/nacl_irt_x86_32.nexe', 97 'outputs': ['<(PRODUCT_DIR)/nacl_irt_x86_32.nexe',
98 '<(PRODUCT_DIR)/nacl_irt_x86_64.nexe'], 98 '<(PRODUCT_DIR)/nacl_irt_x86_64.nexe'],
99 'action': [ 99 'action': [
100 '<@(irt_build_cmd)', 100 '<@(irt_build_cmd)',
101 '--platform', 'x86-32', 101 '--platform', 'x86-32',
102 '--platform', 'x86-64', 102 '--platform', 'x86-64',
103 ], 103 ],
104 }, 104 },
105 ], 105 ],
106 }], 106 }],
107 ['OS!="win" and target_arch=="ia32" and chromeos==0', { 107 ['OS!="win" and target_arch=="ia32"', {
108 # Linux-x86-32 and OSX need only the x86-32 IRT. 108 # Linux-x86-32 and OSX need only the x86-32 IRT.
109 'actions': [ 109 'actions': [
110 { 110 {
111 'action_name': 'nacl_irt', 111 'action_name': 'nacl_irt',
112 'message': 'Building NaCl IRT', 112 'message': 'Building NaCl IRT',
113 'inputs': [ 113 'inputs': [
114 '<!@(<(irt_inputs_cmd) --platform=x86-32)', 114 '<!@(<(irt_inputs_cmd) --platform=x86-32)',
115 ], 115 ],
116 'outputs': ['<(PRODUCT_DIR)/nacl_irt_x86_32.nexe'], 116 'outputs': ['<(PRODUCT_DIR)/nacl_irt_x86_32.nexe'],
117 'action': [ 117 'action': [
118 '<@(irt_build_cmd)', '--platform', 'x86-32', 118 '<@(irt_build_cmd)', '--platform', 'x86-32',
119 ], 119 ],
120 }, 120 },
121 ], 121 ],
122 }], 122 }],
123 ['OS!="win" and target_arch=="x64" and chromeos==0', { 123 ['OS!="win" and target_arch=="x64"', {
124 # Linux-x86-64 needs only the x86-64 IRT. 124 # Linux-x86-64 needs only the x86-64 IRT.
125 'actions': [ 125 'actions': [
126 { 126 {
127 'action_name': 'nacl_irt', 127 'action_name': 'nacl_irt',
128 'message': 'Building NaCl IRT', 128 'message': 'Building NaCl IRT',
129 'inputs': [ 129 'inputs': [
130 '<!@(<(irt_inputs_cmd) --platform=x86-64)', 130 '<!@(<(irt_inputs_cmd) --platform=x86-64)',
131 ], 131 ],
132 'outputs': ['<(PRODUCT_DIR)/nacl_irt_x86_64.nexe'], 132 'outputs': ['<(PRODUCT_DIR)/nacl_irt_x86_64.nexe'],
133 'action': [ 133 'action': [
(...skipping 96 matching lines...) Expand 10 before | Expand all | Expand 10 after
230 # reference nacl_helper as a shared library 230 # reference nacl_helper as a shared library
231 '<(PRODUCT_DIR)/nacl_helper.so', 231 '<(PRODUCT_DIR)/nacl_helper.so',
232 '-Wl,-rpath,<(SHARED_LIB_DIR)', 232 '-Wl,-rpath,<(SHARED_LIB_DIR)',
233 ], 233 ],
234 }, 234 },
235 }, 235 },
236 ], 236 ],
237 }], 237 }],
238 ], 238 ],
239 } 239 }
OLDNEW
« build/download_nacl_toolchains.py ('K') | « build/download_nacl_toolchains.py ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698