Upstream version 9.38.198.0

[platform/framework/web/crosswalk.git] / src / native_client / src / trusted / service_runtime / build.scons

diff --git a/src/native_client/src/trusted/service_runtime/build.scons b/src/native_client/src/trusted/service_runtime/build.scons
index 3062df4..413be19 100644 (file)
--- a/src/native_client/src/trusted/service_runtime/build.scons
+++ b/src/native_client/src/trusted/service_runtime/build.scons
@@ -67,6 +67,7 @@ ldr_inputs = [
     'sel_ldr.c',
     'sel_ldr_standard.c',
     'sel_ldr_thread_interface.c',
+    'sel_main_common.c',
     'sel_mem.c',
     'sel_qualify.c',
     'sel_validate_image.c',
@@ -449,18 +450,10 @@ if (env.Bit('linux') and not env.Bit('built_elsewhere')):
        bootstrap_env.File('linux/nacl_bootstrap.x')),
       )
 
-  # The bootstrap program is used as an intermediate program so it
-  # must be built in the current build environment.
-  munge_env = env['BUILD_ENV']
-  bootstrap_munge = munge_env.Program(
-      'nacl_bootstrap_munge_phdr',
-      ['linux/nacl_bootstrap_munge_phdr.c'],
-      LIBS=['elf'])
-
   bootstrap_prog = bootstrap_env.Command(
       'nacl_helper_bootstrap',
       [bootstrap_env.File('linux/nacl_bootstrap_munge_phdr.py'),
-       bootstrap_munge, bootstrap_raw],
+       bootstrap_raw],
       '${PYTHON} ${SOURCES} ${TARGET}'
       )
   bootstrap_out = bootstrap_env.Install('${STAGING_DIR}', bootstrap_prog)
@@ -1032,7 +1025,7 @@ env.AddNodeToTestSuite(node, ['small_tests'],
 
 exe = env.ComponentProgram('nacl_error_log_test',
                             ['nacl_error_log_test.c'],
-                            EXTRA_LIBS=sel_ldr_libs)
+                            EXTRA_LIBS=sel_ldr_libs + ['sel_main_chrome'])
 
 if env.Bit('coverage_enabled'):
   expected_exit = 'naclabort_coverage'