summaryrefslogtreecommitdiffstats
path: root/ppapi/native_client
diff options
context:
space:
mode:
authormseaborn@chromium.org <mseaborn@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-04-30 22:36:36 +0000
committermseaborn@chromium.org <mseaborn@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-04-30 22:36:36 +0000
commitbdf3948b4606f1ebc1680a778fadc5fac7ce8d4f (patch)
tree4d73c5f137d7bdceadeaa8ac6e01f524d8bfb873 /ppapi/native_client
parent10462c3aecc4c8920e5db5c07360cdda999eb335 (diff)
downloadchromium_src-bdf3948b4606f1ebc1680a778fadc5fac7ce8d4f.zip
chromium_src-bdf3948b4606f1ebc1680a778fadc5fac7ce8d4f.tar.gz
chromium_src-bdf3948b4606f1ebc1680a778fadc5fac7ce8d4f.tar.bz2
NaCl: Synchronise build.scons file with Gyp file
I moved sel_ldr_launcher_chrome.cc into the Chromium repo in r134552 but I forgot to update build.scons. This update is necessary for removing sel_ldr_launcher_chrome.cc from the NaCl repo because it ensures that the 'launch_nacl_process' variable (which module_ppapi.cc assigns to) will be defined. (The alternative would be to conditionalise the assignment of 'launch_nacl_process' in module_ppapi.cc.) BUG=http://code.google.com/p/nativeclient/issues/detail?id=2750 TEST=NaCl's Scons build Review URL: http://codereview.chromium.org/10261016 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@134619 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ppapi/native_client')
-rw-r--r--ppapi/native_client/src/trusted/plugin/build.scons1
1 files changed, 1 insertions, 0 deletions
diff --git a/ppapi/native_client/src/trusted/plugin/build.scons b/ppapi/native_client/src/trusted/plugin/build.scons
index 143c713..06eebb0 100644
--- a/ppapi/native_client/src/trusted/plugin/build.scons
+++ b/ppapi/native_client/src/trusted/plugin/build.scons
@@ -65,6 +65,7 @@ common_inputs = [
'pnacl_coordinator.cc',
'pnacl_resources.cc',
'scriptable_plugin.cc',
+ 'sel_ldr_launcher_chrome.cc',
'service_runtime.cc',
'srpc_client.cc',
'srpc_params.cc',