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

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

Issue 594733005: Cleanup: Remove src/trusted/gio/, since it is unused (Closed) Base URL: svn://svn.chromium.org/native_client/trunk/src/native_client
Patch Set: Fix Created 6 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 | « src/trusted/service_runtime/BUILD.gn ('k') | src/trusted/service_runtime/sel_ldr.c » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 305 matching lines...) Expand 10 before | Expand all | Expand 10 after
316 ) 316 )
317 317
318 sel_ldr_libs = ['sel', 318 sel_ldr_libs = ['sel',
319 'sel_main', 319 'sel_main',
320 'desc_cacheability', 320 'desc_cacheability',
321 'env_cleanser', 321 'env_cleanser',
322 'nacl_error_code', 322 'nacl_error_code',
323 'manifest_proxy', 323 'manifest_proxy',
324 'simple_service', 324 'simple_service',
325 'thread_interface', 325 'thread_interface',
326 'gio_wrapped_desc',
327 'nonnacl_srpc', 326 'nonnacl_srpc',
328 'nrd_xfer', 327 'nrd_xfer',
329 'nacl_perf_counter', 328 'nacl_perf_counter',
330 'nacl_base', 329 'nacl_base',
331 'imc', 330 'imc',
332 'nacl_fault_inject', 331 'nacl_fault_inject',
333 'nacl_interval', 332 'nacl_interval',
334 'platform', 333 'platform',
335 'platform_qual_lib', 334 'platform_qual_lib',
336 'validators', 335 'validators',
(...skipping 17 matching lines...) Expand all
354 dylib_env.ComponentProgram('dummy_sel_ldr.dylib', sel_main_objs, 353 dylib_env.ComponentProgram('dummy_sel_ldr.dylib', sel_main_objs,
355 EXTRA_LIBS=['sel_main']) 354 EXTRA_LIBS=['sel_main'])
356 355
357 # NOTE: we do not have segments on ARM 356 # NOTE: we do not have segments on ARM
358 if env.Bit('build_x86'): 357 if env.Bit('build_x86'):
359 env.ComponentProgram('nacl_ldt_unittest', 358 env.ComponentProgram('nacl_ldt_unittest',
360 'nacl_ldt_unittest.c', 359 'nacl_ldt_unittest.c',
361 EXTRA_LIBS=['sel', 360 EXTRA_LIBS=['sel',
362 'env_cleanser', 361 'env_cleanser',
363 'nacl_perf_counter', 362 'nacl_perf_counter',
364 'gio_wrapped_desc',
365 'nacl_fault_inject', 363 'nacl_fault_inject',
366 'platform', 364 'platform',
367 ]) 365 ])
368 366
369 env.SDKInstallBin('sel_ldr', SEL_LDR_NODE) 367 env.SDKInstallBin('sel_ldr', SEL_LDR_NODE)
370 368
371 if env.Bit('linux') and env.Bit('target_x86_64'): 369 if env.Bit('linux') and env.Bit('target_x86_64'):
372 sel_ldr_seccomp_node = env.ComponentProgram('sel_ldr_seccomp', 370 sel_ldr_seccomp_node = env.ComponentProgram('sel_ldr_seccomp',
373 ['sel_ldr_seccomp_main.c'], 371 ['sel_ldr_seccomp_main.c'],
374 EXTRA_LIBS=['sel_main', 372 EXTRA_LIBS=['sel_main',
(...skipping 104 matching lines...) Expand 10 before | Expand all | Expand 10 after
479 477
480 if not env.Bit('coverage_enabled') or not env.Bit('windows'): 478 if not env.Bit('coverage_enabled') or not env.Bit('windows'):
481 unit_tests_exe = gtest_env.ComponentProgram( 479 unit_tests_exe = gtest_env.ComponentProgram(
482 'service_runtime_tests', 480 'service_runtime_tests',
483 unittest_inputs, 481 unittest_inputs,
484 EXTRA_LIBS=['sel', 482 EXTRA_LIBS=['sel',
485 'env_cleanser', 483 'env_cleanser',
486 'manifest_proxy', 484 'manifest_proxy',
487 'simple_service', 485 'simple_service',
488 'thread_interface', 486 'thread_interface',
489 'gio_wrapped_desc',
490 'nonnacl_srpc', 487 'nonnacl_srpc',
491 'nrd_xfer', 488 'nrd_xfer',
492 'nacl_perf_counter', 489 'nacl_perf_counter',
493 'nacl_base', 490 'nacl_base',
494 'imc', 491 'imc',
495 'nacl_fault_inject', 492 'nacl_fault_inject',
496 'nacl_interval', 493 'nacl_interval',
497 'platform', 494 'platform',
498 'sel_test', 495 'sel_test',
499 ]) 496 ])
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
538 # NOTE: uses validator 535 # NOTE: uses validator
539 mmap_test_objs = [env.ComponentObject('mmap_test.c')] 536 mmap_test_objs = [env.ComponentObject('mmap_test.c')]
540 mmap_test_exe = env.ComponentProgram( 537 mmap_test_exe = env.ComponentProgram(
541 'mmap_test', 538 'mmap_test',
542 mmap_test_objs, 539 mmap_test_objs,
543 EXTRA_LIBS=['sel', 540 EXTRA_LIBS=['sel',
544 'env_cleanser', 541 'env_cleanser',
545 'manifest_proxy', 542 'manifest_proxy',
546 'simple_service', 543 'simple_service',
547 'thread_interface', 544 'thread_interface',
548 'gio_wrapped_desc',
549 'nonnacl_srpc', 545 'nonnacl_srpc',
550 'nrd_xfer', 546 'nrd_xfer',
551 'nacl_perf_counter', 547 'nacl_perf_counter',
552 'nacl_base', 548 'nacl_base',
553 'imc', 549 'imc',
554 'nacl_fault_inject', 550 'nacl_fault_inject',
555 'nacl_interval', 551 'nacl_interval',
556 'platform', 552 'platform',
557 'sel_test', 553 'sel_test',
558 ]) 554 ])
(...skipping 28 matching lines...) Expand all
587 # NOTE: uses validator 583 # NOTE: uses validator
588 is_broken = env.Bit('coverage_enabled') or env.Bit('running_on_vm') 584 is_broken = env.Bit('coverage_enabled') or env.Bit('running_on_vm')
589 nacl_sync_cond_test_exe = env.ComponentProgram( 585 nacl_sync_cond_test_exe = env.ComponentProgram(
590 'nacl_sync_cond_test', 586 'nacl_sync_cond_test',
591 ['nacl_sync_cond_test.c'], 587 ['nacl_sync_cond_test.c'],
592 EXTRA_LIBS=['sel', 588 EXTRA_LIBS=['sel',
593 'env_cleanser', 589 'env_cleanser',
594 'manifest_proxy', 590 'manifest_proxy',
595 'simple_service', 591 'simple_service',
596 'thread_interface', 592 'thread_interface',
597 'gio_wrapped_desc',
598 'nonnacl_srpc', 593 'nonnacl_srpc',
599 'nrd_xfer', 594 'nrd_xfer',
600 'nacl_perf_counter', 595 'nacl_perf_counter',
601 'nacl_base', 596 'nacl_base',
602 'imc', 597 'imc',
603 'nacl_fault_inject', 598 'nacl_fault_inject',
604 'nacl_interval', 599 'nacl_interval',
605 'platform', 600 'platform',
606 ]) 601 ])
607 node = env.CommandTest( 602 node = env.CommandTest(
608 'nacl_sync_cond_test.out', 603 'nacl_sync_cond_test.out',
609 command=[nacl_sync_cond_test_exe]) 604 command=[nacl_sync_cond_test_exe])
610 env.AddNodeToTestSuite(node, 605 env.AddNodeToTestSuite(node,
611 ['medium_tests'], 606 ['medium_tests'],
612 'run_nacl_sync_cond_test', 607 'run_nacl_sync_cond_test',
613 is_broken=is_broken) 608 is_broken=is_broken)
614 609
615 610
616 env_cleanser_test_exe = env.ComponentProgram('env_cleanser_test', 611 env_cleanser_test_exe = env.ComponentProgram('env_cleanser_test',
617 ['env_cleanser_test.c'], 612 ['env_cleanser_test.c'],
618 EXTRA_LIBS=['env_cleanser', 613 EXTRA_LIBS=['env_cleanser'])
619 'gio_wrapped_desc',
620 ])
621 node = env.CommandTest( 614 node = env.CommandTest(
622 'env_cleanser_test.out', 615 'env_cleanser_test.out',
623 command=[env_cleanser_test_exe]) 616 command=[env_cleanser_test_exe])
624 env.AddNodeToTestSuite(node, ['small_tests'], 'run_env_cleanser_test') 617 env.AddNodeToTestSuite(node, ['small_tests'], 'run_env_cleanser_test')
625 618
626 # Test nacl_resource 619 # Test nacl_resource
627 620
628 nacl_resource_test_exe = env.ComponentProgram('nacl_resource_test', 621 nacl_resource_test_exe = env.ComponentProgram('nacl_resource_test',
629 ['nacl_resource_test.c'], 622 ['nacl_resource_test.c'],
630 EXTRA_LIBS=['sel']) 623 EXTRA_LIBS=['sel'])
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
683 exit_status='untrusted_segfault', 676 exit_status='untrusted_segfault',
684 stdout_golden=env.File('win/exception_patch/fallback_test.stdout')) 677 stdout_golden=env.File('win/exception_patch/fallback_test.stdout'))
685 env.AddNodeToTestSuite(node, ['small_tests'], 'run_ntdll_fallback_test') 678 env.AddNodeToTestSuite(node, ['small_tests'], 'run_ntdll_fallback_test')
686 679
687 680
688 check_test_exe = env.ComponentProgram('nacl_check_test', 681 check_test_exe = env.ComponentProgram('nacl_check_test',
689 ['nacl_check_test.c'], 682 ['nacl_check_test.c'],
690 EXTRA_LIBS=['sel', 683 EXTRA_LIBS=['sel',
691 'env_cleanser', 684 'env_cleanser',
692 'nacl_perf_counter', 685 'nacl_perf_counter',
693 'gio_wrapped_desc',
694 'nacl_fault_inject', 686 'nacl_fault_inject',
695 'nacl_interval', 687 'nacl_interval',
696 'platform', 688 'platform',
697 ]) 689 ])
698 node = env.CommandTest( 690 node = env.CommandTest(
699 'check_test.out', 691 'check_test.out',
700 command=[check_test_exe, '-C']) 692 command=[check_test_exe, '-C'])
701 env.AddNodeToTestSuite(node, ['small_tests'], 'run_check_test') 693 env.AddNodeToTestSuite(node, ['small_tests'], 'run_check_test')
702 694
703 695
(...skipping 268 matching lines...) Expand 10 before | Expand all | Expand 10 after
972 if not env.Bit('coverage_enabled') or not env.Bit('windows'): 964 if not env.Bit('coverage_enabled') or not env.Bit('windows'):
973 # NOTE: uses validator 965 # NOTE: uses validator
974 sel_ldr_thread_death_test_exe = env.ComponentProgram( 966 sel_ldr_thread_death_test_exe = env.ComponentProgram(
975 'sel_ldr_thread_death_test', 967 'sel_ldr_thread_death_test',
976 ['sel_ldr_thread_death_test.c'], 968 ['sel_ldr_thread_death_test.c'],
977 EXTRA_LIBS=['sel', 969 EXTRA_LIBS=['sel',
978 'env_cleanser', 970 'env_cleanser',
979 'manifest_proxy', 971 'manifest_proxy',
980 'simple_service', 972 'simple_service',
981 'thread_interface', 973 'thread_interface',
982 'gio_wrapped_desc',
983 'nonnacl_srpc', 974 'nonnacl_srpc',
984 'nrd_xfer', 975 'nrd_xfer',
985 'nacl_perf_counter', 976 'nacl_perf_counter',
986 'nacl_base', 977 'nacl_base',
987 'imc', 978 'imc',
988 'nacl_fault_inject', 979 'nacl_fault_inject',
989 'nacl_interval', 980 'nacl_interval',
990 'platform', 981 'platform',
991 ]) 982 ])
992 983
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
1040 is_broken=is_broken) 1031 is_broken=is_broken)
1041 1032
1042 dyn_array_test_exe = env.ComponentProgram('dyn_array_test', 1033 dyn_array_test_exe = env.ComponentProgram('dyn_array_test',
1043 ['dyn_array_test.c'], 1034 ['dyn_array_test.c'],
1044 EXTRA_LIBS=sel_ldr_libs) 1035 EXTRA_LIBS=sel_ldr_libs)
1045 1036
1046 node = env.CommandTest('dyn_array_test.out', 1037 node = env.CommandTest('dyn_array_test.out',
1047 command=[dyn_array_test_exe]) 1038 command=[dyn_array_test_exe])
1048 1039
1049 env.AddNodeToTestSuite(node, ['small_tests'], 'run_dyn_array_test') 1040 env.AddNodeToTestSuite(node, ['small_tests'], 'run_dyn_array_test')
OLDNEW
« no previous file with comments | « src/trusted/service_runtime/BUILD.gn ('k') | src/trusted/service_runtime/sel_ldr.c » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698