OLD | NEW |
---|---|
1 # -*- python -*- | 1 # -*- python -*- |
2 # | 2 # |
3 # Copyright (c) 2011 The Native Client Authors. All rights reserved. | 3 # Copyright (c) 2011 The Native Client Authors. All rights reserved. |
4 # Use of this source code is governed by a BSD-style license that can be | 4 # Use of this source code is governed by a BSD-style license that can be |
5 # found in the LICENSE file. | 5 # found in the LICENSE file. |
6 | 6 |
7 { | 7 { |
8 'variables': { | 8 'variables': { |
9 'common_sources': [ | 9 'common_sources': [ |
10 'nacl_check.c', | 10 'nacl_check.c', |
(...skipping 156 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
167 'target_name': 'platform_tests', | 167 'target_name': 'platform_tests', |
168 'type': 'executable', | 168 'type': 'executable', |
169 'variables': { | 169 'variables': { |
170 'target_base': 'platform_tests', | 170 'target_base': 'platform_tests', |
171 }, | 171 }, |
172 'dependencies': [ | 172 'dependencies': [ |
173 '<(DEPTH)/native_client/src/shared/platform/platform.gyp:platform', | 173 '<(DEPTH)/native_client/src/shared/platform/platform.gyp:platform', |
174 '<(DEPTH)/native_client/src/shared/gio/gio.gyp:gio', | 174 '<(DEPTH)/native_client/src/shared/gio/gio.gyp:gio', |
175 ], | 175 ], |
176 }, | 176 }, |
177 { | |
178 'target_name': 'platform_lib', | |
179 'type': 'none', | |
180 'variables': { | |
181 'nlib_target': 'libplatform.a', | |
182 'build_glibc': 1, | |
183 'build_newlib': 1, | |
184 'sources': [ | |
185 'nacl_check.c', | |
186 'nacl_log.c', | |
187 'linux/condition_variable.c', | |
188 'linux/lock.c', | |
189 'linux/nacl_exit.c', | |
190 'linux/nacl_thread_id.c', | |
191 'linux/nacl_threads.c', | |
192 'linux/nacl_timestamp.c', | |
193 'nacl_sync_checked.c', | |
194 'refcount_base.cc', | |
195 ] | |
Mark Seaborn
2012/03/28 07:21:02
indent -2; same for other closing brackets below.
Nikolay
2012/03/28 13:24:23
Thanks, seems my beloved editor misused python-mod
| |
196 }, | |
197 'dependencies': [ | |
198 '<(DEPTH)/native_client/tools.gyp:prep_toolchain', | |
199 ], | |
200 }, | |
177 # ---------------------------------------------------------------------- | 201 # ---------------------------------------------------------------------- |
178 ], | 202 ], |
179 'conditions': [ | 203 'conditions': [ |
180 # NOTE: we do not support untrusted gyp build on arm yet. | |
181 ['target_arch!="arm"', { | |
182 'targets': [ | |
183 { | |
184 'target_name': 'platform_lib', | |
185 'type': 'none', | |
186 'variables': { | |
187 'nlib_target': 'libplatform.a', | |
188 'build_glibc': 1, | |
189 'build_newlib': 1, | |
190 'sources': [ | |
191 'nacl_check.c', | |
192 'nacl_log.c', | |
193 'linux/condition_variable.c', | |
194 'linux/lock.c', | |
195 'linux/nacl_exit.c', | |
196 'linux/nacl_thread_id.c', | |
197 'linux/nacl_threads.c', | |
198 'linux/nacl_timestamp.c', | |
199 'nacl_sync_checked.c', | |
200 'refcount_base.cc', | |
201 ] | |
202 }, | |
203 'dependencies': [ | |
204 '<(DEPTH)/native_client/tools.gyp:prep_toolchain', | |
205 ], | |
206 }], | |
207 }], | |
208 ['OS=="win"', { | 204 ['OS=="win"', { |
209 'targets': [ | 205 'targets': [ |
210 # --------------------------------------------------------------------- | 206 # --------------------------------------------------------------------- |
211 { | 207 { |
212 'target_name': 'platform64', | 208 'target_name': 'platform64', |
213 'type': 'static_library', | 209 'type': 'static_library', |
214 'variables': { | 210 'variables': { |
215 'target_base': 'platform_lib', | 211 'target_base': 'platform_lib', |
216 'win_target': 'x64', | 212 'win_target': 'x64', |
217 }, | 213 }, |
(...skipping 14 matching lines...) Expand all Loading... | |
232 ], | 228 ], |
233 'dependencies': [ | 229 'dependencies': [ |
234 '<(DEPTH)/native_client/src/shared/platform/platform.gyp:platform64' , | 230 '<(DEPTH)/native_client/src/shared/platform/platform.gyp:platform64' , |
235 '<(DEPTH)/native_client/src/shared/gio/gio.gyp:gio64', | 231 '<(DEPTH)/native_client/src/shared/gio/gio.gyp:gio64', |
236 ], | 232 ], |
237 }, | 233 }, |
238 ], | 234 ], |
239 }], | 235 }], |
240 ], | 236 ], |
241 } | 237 } |
242 | |
OLD | NEW |