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

Side by Side Diff: src/trusted/service_runtime/build.scons

Issue 10905317: Generic containers moved into a separate module (Closed) Base URL: svn://svn.chromium.org/native_client/trunk/src/native_client
Patch Set: Rebased with master. Created 8 years, 2 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 # -*- python -*- 1 # -*- python -*-
2 # Copyright (c) 2012 The Native Client Authors. All rights reserved. 2 # Copyright (c) 2012 The Native Client Authors. All rights reserved.
3 # Use of this source code is governed by a BSD-style license that can be 3 # Use of this source code is governed by a BSD-style license that can be
4 # found in the LICENSE file. 4 # found in the LICENSE file.
5 5
6 import platform 6 import platform
7 import os 7 import os
8 8
9 Import('env') 9 Import('env')
10 10
(...skipping 256 matching lines...) Expand 10 before | Expand all | Expand 10 after
267 env.DualLibrary('sel_main_chrome', ['sel_main_chrome.c']) 267 env.DualLibrary('sel_main_chrome', ['sel_main_chrome.c'])
268 268
269 env.DualLibrary('sel_main', ['sel_main.c']) 269 env.DualLibrary('sel_main', ['sel_main.c'])
270 270
271 env.DualLibrary('env_cleanser', ['env_cleanser.c']) 271 env.DualLibrary('env_cleanser', ['env_cleanser.c'])
272 272
273 env.DualLibrary('nacl_error_code', 273 env.DualLibrary('nacl_error_code',
274 ['nacl_error_code.c', 274 ['nacl_error_code.c',
275 ]) 275 ])
276 276
277 env.ComponentLibrary('container',
278 ['generic_container/container.c',
279 ])
280
281 if env.Bit('windows'): 277 if env.Bit('windows'):
282 env.ComponentLibrary('sel_test', 'win/mmap_test_check.cc') 278 env.ComponentLibrary('sel_test', 'win/mmap_test_check.cc')
283 elif env.Bit('mac'): 279 elif env.Bit('mac'):
284 env.ComponentLibrary('sel_test', 'osx/mmap_test_check.cc') 280 env.ComponentLibrary('sel_test', 'osx/mmap_test_check.cc')
285 elif env.Bit('linux'): 281 elif env.Bit('linux'):
286 env.ComponentLibrary('sel_test', 'linux/mmap_test_check.cc') 282 env.ComponentLibrary('sel_test', 'linux/mmap_test_check.cc')
287 else: 283 else:
288 raise AssertionError('Unsupported host OS') 284 raise AssertionError('Unsupported host OS')
289 285
290 286
(...skipping 20 matching lines...) Expand all
311 'nacl_error_code', 307 'nacl_error_code',
312 'manifest_proxy', 308 'manifest_proxy',
313 'simple_service', 309 'simple_service',
314 'thread_interface', 310 'thread_interface',
315 'gio_wrapped_desc', 311 'gio_wrapped_desc',
316 'nonnacl_srpc', 312 'nonnacl_srpc',
317 'nrd_xfer', 313 'nrd_xfer',
318 'nacl_perf_counter', 314 'nacl_perf_counter',
319 'nacl_base', 315 'nacl_base',
320 'imc', 316 'imc',
321 'container',
322 'nacl_fault_inject', 317 'nacl_fault_inject',
323 'nacl_interval', 318 'nacl_interval',
324 'platform', 319 'platform',
325 'platform_qual_lib', 320 'platform_qual_lib',
326 'validators', 321 'validators',
327 ] 322 ]
328 323
329 if not env.Bit('coverage_enabled') or not env.Bit('windows'): 324 if not env.Bit('coverage_enabled') or not env.Bit('windows'):
330 sel_main_objs = [env.ComponentObject('nacl_test_injection_main.c')] 325 sel_main_objs = [env.ComponentObject('nacl_test_injection_main.c')]
331 SEL_LDR_NODE = env.ComponentProgram('sel_ldr', sel_main_objs, 326 SEL_LDR_NODE = env.ComponentProgram('sel_ldr', sel_main_objs,
(...skipping 671 matching lines...) Expand 10 before | Expand all | Expand 10 after
1003 node = env.CommandTest( 998 node = env.CommandTest(
1004 'nacl_error_log_test.out', 999 'nacl_error_log_test.out',
1005 command=[exe], 1000 command=[exe],
1006 exit_status=expected_exit, 1001 exit_status=expected_exit,
1007 filter_regex='"(NaClCrashLogWriter.*)|(This is a test of the emergency.*)"', 1002 filter_regex='"(NaClCrashLogWriter.*)|(This is a test of the emergency.*)"',
1008 filter_group_only='true', 1003 filter_group_only='true',
1009 stdout_golden=env.File('nacl_error_log_test.stdout')) 1004 stdout_golden=env.File('nacl_error_log_test.stdout'))
1010 1005
1011 env.AddNodeToTestSuite(node, ['small_tests'], 1006 env.AddNodeToTestSuite(node, ['small_tests'],
1012 'run_nacl_error_log_test') 1007 'run_nacl_error_log_test')
OLDNEW
« no previous file with comments | « src/trusted/generic_container/generic_container.gyp ('k') | src/trusted/service_runtime/generic_container/container.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698