Remove some unused code that fails to compile with -Wundef

src/trusted/service_runtime/build.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 platform
 import os
 
 Import('env')
 
@@ skipping 256 matching lines @@
                 ['nacl_error_code.c',
                  ])
 
 env.ComponentLibrary('sel_debug_dummy', 'nacl_debug_init_dummy.c')
 
 env.ComponentLibrary('container',
                      ['generic_container/container.c',
                       ])
 
 
-env.ComponentLibrary('nacl_xdr',
-                     ['fs/xdr.c',
-                      'fs/obj_proxy.c',
-                      ])
-
 # NOTE(robertm): these extra libs were orignially only added to the
 #                sel_ldr binary
 # TODO(robertm): see who really needs them and remove
 if env.Bit('windows'):
   env.Append(
       LIBS = [
           'ws2_32',
           'kernel32',
           'advapi32',
           'winmm',
@@ skipping 480 matching lines @@
   auxv_stdout = env.File(os.path.join(arch_testdata_dir, 'auxv_phdr.stdout'))
   node = env.CommandSelLdrTestNacl('auxv_phdr.out',
                                    auxv_nexe, stdout_golden=auxv_stdout)
   # TODO(mcgrathr): Add arm testdata files and remove the is_broken.
   # Producing a working ARM binary requires debugging untrusted ARM stuff
   # that the auxv_phdr support enables, so is putting cart before horse.
   env.AddNodeToTestSuite(node, ['small_tests'], 'run_auxv_phdr_test',
                          is_broken=not os.path.exists(str(auxv_nexe)))
 
 # ----------------------------------------------------------
-# Integration Tests
-# ----------------------------------------------------------
-
-# 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',
-                  'nacl_fault_inject',
-                  'nacl_interval',
-                  'platform',
-                  'nacl_xdr',
-                  'container',
-                  ] + DEBUG_LIBS)
-
-  node = env.CommandTest(
-      'obj_proxy_test.out',
-      # NOTE: this is run out of obj/ rather than staging/
-      [obj_proxy_test, '-n', '2048'],
-      size='huge')
-  # TODO(bsy): change this test to use less time -- most of it (on windows)
-  # is in the RNG, so with this will inherently speed up when the RNG is
-  # updated.
-
-  env.AddNodeToTestSuite(node, ['small_tests'], 'obj_proxy_tests')
-
-# ----------------------------------------------------------
 # Integration Tests With Canned x86 Binaries
 # ----------------------------------------------------------
 # To update the canned tests run:
 # ./scons platform=x86-64
 # cp scons-out/nacl-x86-64/staging/{mandel.nexe,fib_*} \
 #     src/trusted/service_runtime/testdata/x86_64/
 # ./scons platform=x86-32
 # cp scons-out/nacl-x86-32/staging/{mandel.nexe,fib_*} \
 #     src/trusted/service_runtime/testdata/x86_32/
 
@@ skipping 140 matching lines @@
   # TODO(tuduce): Make it work on windows.
   env.AddNodeToTestSuite(node, ['medium_tests'],
                          'run_sel_ldr_thread_death_test',
                          is_broken=env.Bit('windows'))
 
 
 # This currently tests linking of sel_main_chrome.c *only*.  We do not
 # expect this program to do anything meaningful when run.
 env.ComponentProgram('sel_main_chrome_test', ['sel_main_chrome_test.c'],
                      EXTRA_LIBS=sel_ldr_libs)