Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3)

Side by Side Diff: src/trusted/plugin/build.scons

Issue 6452010: Remove the x-ppapi-nacl-srpc and x-nacl-srpc mime types in favor of the singl... (Closed) Base URL: svn://svn.chromium.org/native_client/trunk/src/native_client/
Patch Set: '' Created 9 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | src/trusted/plugin/nacl_entry_points.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # -*- python -*- 1 # -*- python -*-
2 # Copyright 2008 The Native Client Authors. All rights reserved. 2 # Copyright 2008 The Native Client Authors. All rights reserved.
3 # Use of this source code is governed by a BSD-style license that can 3 # Use of this source code is governed by a BSD-style license that can
4 # be found in the LICENSE file. 4 # be found in the LICENSE file.
5 5
6 # TODO(polina): for Mac build check if no longer need .r files and/or document 6 # TODO(polina): for Mac build check if no longer need .r files and/or document
7 # target browsers for each bundle target. 7 # target browsers for each bundle target.
8 8
9 Import('env') 9 Import('env')
10 10
(...skipping 234 matching lines...) Expand 10 before | Expand all | Expand 10 after
245 245
246 246
247 ############################################################################### 247 ###############################################################################
248 # PPAPI Plugin Build 248 # PPAPI Plugin Build
249 ############################################################################### 249 ###############################################################################
250 250
251 # The PPAPI (Pepper v2) plugin is used in Chrome only. 251 # The PPAPI (Pepper v2) plugin is used in Chrome only.
252 # 252 #
253 # We build a shared library with this build script to allow easier build 253 # We build a shared library with this build script to allow easier build
254 # testing. This library can also be loaded into Chrome using --no-sandbox 254 # testing. This library can also be loaded into Chrome using --no-sandbox
255 # --register-pepper-plugins="path/to/library;application/x-ppapi-nacl-srpc". 255 # --register-pepper-plugins="path/to/library;application/x-nacl".
256 # 256 #
257 # The .gyp files include rules used to link the plugin statically into Chrome. 257 # The .gyp files include rules used to link the plugin statically into Chrome.
258 # (This is still work in progress as of mid-Nov 2010.) 258 # (This is still work in progress as of mid-Nov 2010.)
259 # 259 #
260 # The PPAPI plugin uses code from 260 # The PPAPI plugin uses code from
261 # trusted/plugin/ppapi/ - for implementing NaCl as a trusted PPAPI plugin 261 # trusted/plugin/ppapi/ - for implementing NaCl as a trusted PPAPI plugin
262 # shared/ppapi_proxy/ - for proxying PPAPI to NaCl modules 262 # shared/ppapi_proxy/ - for proxying PPAPI to NaCl modules
263 ppapi_inputs = [ 263 ppapi_inputs = [
264 'ppapi/array_ppapi.cc', 264 'ppapi/array_ppapi.cc',
265 'ppapi/browser_interface_ppapi.cc', 265 'ppapi/browser_interface_ppapi.cc',
(...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after
344 unittest_sources, 344 unittest_sources,
345 no_import_lib=True) 345 no_import_lib=True)
346 node = env.CommandTest('ppapi_plugin_unittest.out', 346 node = env.CommandTest('ppapi_plugin_unittest.out',
347 command=[unittest, 347 command=[unittest,
348 ppapi_plugin, 348 ppapi_plugin,
349 env['BUILD_ISA_NAME']]) 349 env['BUILD_ISA_NAME']])
350 env.AddNodeToTestSuite(node, ['small_tests'], 'run_ppapi_plugin_unittest') 350 env.AddNodeToTestSuite(node, ['small_tests'], 'run_ppapi_plugin_unittest')
351 351
352 352
353 # TODO(polina,sehr): add a test for the PPAPI plugin on ARM. 353 # TODO(polina,sehr): add a test for the PPAPI plugin on ARM.
OLDNEW
« no previous file with comments | « no previous file | src/trusted/plugin/nacl_entry_points.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698