Scons: Drop the uses_ppapi argument from CommandSelLdrTestNacl()

src/untrusted/irt/nacl.scons

 # -*- python -*-
 # Copyright (c) 2012 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('env')
 
 # This module shouldn't be built in an environment that uses glibc.
 if env.Bit('nacl_glibc'):
@@ skipping 29 matching lines @@
     'irt_thread.c',
     'irt_mutex.c',
     'irt_cond.c',
     'irt_sem.c',
     'irt_tls.c',
     'irt_blockhook.c',
     'irt_clock.c',
     'irt_dev_exception_handling.c',
     'irt_nameservice.c',
     'irt_random.c',
+    'irt_manifest.c',

[Nick Bray (chromium), 2012/08/22 22:24:13]

Alphabetize.  Or not.

     ]
 
 # These are the objects and libraries that go into every IRT image.
 irt_support_objs = [blob_env.ComponentObject(x) for x in
                     (irt_support_sources + irt_common_interfaces)]
 
 # We also get nc_init_private.c, nc_thread.c and nc_tsd.c via
 # #includes of .c files.
 irt_support_objs += [
     blob_env.ComponentObject(module,
@@ skipping 23 matching lines @@
   # sufficient because of link ordering issues.
   env.Replicate('${STAGING_DIR}', read_tp_obj)
 
 # Build a library so that irt_support_objs can be used in tests that
 # cover IRT-internal code.
 env.ComponentLibrary('libirt_support_private', irt_support_objs)
 
 # These go into only one image or the other.
 irt_nonbrowser = ['irt_interfaces.c',
                   'irt_core_entry.c',
-                  'irt_core_resource.c',
                   ]
 
 irt_browser = ['irt_interfaces_ppapi.c',
                'irt_entry_ppapi.c',
                'irt_ppapi.c',
-               'irt_manifest.c',
                ]
 
 irt_libs = ['srpc',
             'imc_syscalls',
             'platform',
             'gio',
             'm',
             ]
 
 def LinkIrt(output, files, libs):
@@ skipping 36 matching lines @@
                          # Holy cow it takes over 30 seconds to disassemble
                          # the ARM irt.nexe. Set test size to 'large'.
                          size='large')
   env.AddNodeToTestSuite(node, ['small_tests'], 'run_irt_tls_test')
   node = env.CommandTest('irt_core_tls_test.out',
                          ['${PYTHON}', env.File('check_tls.py'),
                           check_tls_arch, '${OBJDUMP}', irt_core_library],
                          # don't run ${PYTHON} under the emulator.
                          direct_emulation=False)
   env.AddNodeToTestSuite(node, ['small_tests'], 'run_irt_core_tls_test')