this patch adds the manifest proxy server to sel_ldr and the manifest

src/trusted/service_runtime/build.scons

 # -*- python -*-
 # Copyright (c) 2011 The Native Client Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import platform
 
 Import('env')
 
 # TODO(robertm): consider adding this to the top level scons files
@@ skipping 254 matching lines @@
 
   # TODO(ncbray) why do we need to link against Cocoa?
   # run_fake_browser_ppapi_test fails on mac, otherwise.
   # http://code.google.com/p/nativeclient/issues/detail?id=1242
   sel_ldr_env = env.Clone()
   if env.Bit('mac'):
     sel_ldr_env.Append(FRAMEWORKS=['Cocoa'])
 
   SEL_LDR_NODE = sel_ldr_env.ComponentProgram('sel_ldr',
                                           'sel_main.c',
                                           EXTRA_LIBS=['sel',

[noelallen_use_chromium, 2011/06/14 02:25:45]

Why do so many tests need manifest_proxy?

[bsy, 2011/06/14 20:30:03]

because scons does not have a way for library A to declare that all uses of
library A must also link against library B.  here A is sel, and B is
manifest_proxy.

                                                       'env_cleanser',
                                                       'nacl_error_code',
+                                                      'manifest_proxy',
                                                       'simple_service',
                                                       'thread_interface',
                                                       'gio_wrapped_desc',
                                                       'nonnacl_srpc',
                                                       'nrd_xfer',
                                                       'nacl_perf_counter',
                                                       'nacl_base',
                                                       'imc',
                                                       'container',
                                                       'platform',
@@ skipping 50 matching lines @@
     'sel_ldr_test.cc',
 ]
 
 if (not env.CrossToolsBuild() and
     (not env.Bit('coverage_enabled') or not env.Bit('windows'))):
   unit_tests_exe = gtest_env.ComponentProgram('service_runtime_tests',
                                               unittest_inputs,
                                               EXTRA_LIBS=['gtest',
                                                           'sel',
                                                           'env_cleanser',
+                                                          'manifest_proxy',
                                                           'simple_service',
                                                           'thread_interface',
                                                           'gio_wrapped_desc',
                                                           'nonnacl_srpc',
                                                           'nrd_xfer',
                                                           'nacl_perf_counter',
                                                           'nacl_base',
                                                           'imc',
                                                           'platform',
                                                           'gio',
@@ skipping 33 matching lines @@
 
 # Doesn't work on windows under coverage.
 # TODO(bradnelson): fix this to work on windows under coverage.
 if ((not env.Bit('windows') or not env.Bit('coverage_enabled')) and
     not env.CrossToolsBuild()):
   # NOTE: uses validator
   mmap_test_exe = env.ComponentProgram('mmap_test',
                                            ['mmap_test.c'],
                                            EXTRA_LIBS=['sel',
                                                        'env_cleanser',
+                                                       'manifest_proxy',
                                                        'simple_service',
                                                        'thread_interface',
                                                        'gio_wrapped_desc',
                                                        'nonnacl_srpc',
                                                        'nrd_xfer',
                                                        'nacl_perf_counter',
                                                        'nacl_base',
                                                        'imc',
                                                        'platform',
                                                        'gio',
@@ skipping 16 matching lines @@
 
 
 # also seems to have issues with windows coverage or VMs
 # NOTE: uses validator
 is_broken = env.Bit('coverage_enabled') or env.Bit('running_on_vm')
 nacl_sync_cond_test_exe = env.ComponentProgram(
     'nacl_sync_cond_test',
     ['nacl_sync_cond_test.c'],
     EXTRA_LIBS=['sel',
                 'env_cleanser',
+                'manifest_proxy',
                 'simple_service',
                 'thread_interface',
                 'gio_wrapped_desc',
                 'nonnacl_srpc',
                 'nrd_xfer',
                 'nacl_perf_counter',
                 'nacl_base',
                 'imc',
                 'platform',
                 'gio',
@@ skipping 164 matching lines @@
 # Doesn't work on windows under coverage.
 # TODO(bradnelson): fix this to work on windows under coverage.
 # NOTE: uses validator
 if ((not env.Bit('windows') or not env.Bit('coverage_enabled')) and
     not env.CrossToolsBuild()):
   obj_proxy_test_inputs = [ 'fs/obj_proxy_test.c', ]
   obj_proxy_test = env.ComponentProgram('obj_proxy_test',
                                             obj_proxy_test_inputs,
                                             EXTRA_LIBS=['sel',
                                                         'env_cleanser',
+                                                        'manifest_proxy',
                                                         'simple_service',
                                                         'thread_interface',
                                                         'gio_wrapped_desc',
                                                         'nonnacl_srpc',
                                                         'nrd_xfer',
                                                         'nacl_perf_counter',
                                                         'nacl_base',
                                                         'imc',
                                                         'platform',
                                                         'gio',
@@ skipping 124 matching lines @@
 # More Death Tests
 # ----------------------------------------------------------
 if (not env.CrossToolsBuild() and
     (not env.Bit('coverage_enabled') or not env.Bit('windows'))):
   # NOTE: uses validator
   sel_ldr_thread_death_test_exe = env.ComponentProgram(
       'sel_ldr_thread_death_test',
       ['sel_ldr_thread_death_test.c'],
       EXTRA_LIBS=['sel',
                   'env_cleanser',
+                  'manifest_proxy',
                   'simple_service',
                   'thread_interface',
                   'gio_wrapped_desc',
                   'nonnacl_srpc',
                   'nrd_xfer',
                   'nacl_perf_counter',
                   'nacl_base',
                   'imc',
                   'platform',
                   'gio',
                   ] + VALIDATOR_LIBS
                   + DEBUG_LIBS)
 
   # NaClAbort() behaves differently when code coverage is enabled: it
   # calls exit() rather than abort().
   if env.Bit('coverage_enabled'):
     expected_exit_status = 'naclabort_coverage'
   else:
     expected_exit_status = 'sigabrt'
   node = env.CommandTest(
       'sel_ldr_thread_death_test.out',
       command=[sel_ldr_thread_death_test_exe],
       exit_status=expected_exit_status)
 
   # TODO(tuduce): Make it work on windows.
   env.AddNodeToTestSuite(node, ['medium_tests'],
                          'run_sel_ldr_thread_death_test',
                          is_broken=env.Bit('windows'))