| OLD | NEW |
| 1 #! -*- python -*- | 1 #! -*- python -*- |
| 2 # Copyright (c) 2012 The Native Client Authors. All rights reserved. | 2 # Copyright (c) 2012 The Native Client Authors. All rights reserved. |
| 3 # Use of this source code is governed by a BSD-style license that can be | 3 # Use of this source code is governed by a BSD-style license that can be |
| 4 # found in the LICENSE file. | 4 # found in the LICENSE file. |
| 5 | 5 |
| 6 import json | 6 import json |
| 7 import os | 7 import os |
| 8 import shutil | 8 import shutil |
| 9 import sys | 9 import sys |
| 10 | 10 |
| (...skipping 18 matching lines...) Expand all Loading... |
| 29 combined.add(file_name) | 29 combined.add(file_name) |
| 30 return sorted(combined) | 30 return sorted(combined) |
| 31 | 31 |
| 32 | 32 |
| 33 ppapi_scons_files = {} | 33 ppapi_scons_files = {} |
| 34 ppapi_scons_files['trusted_scons_files'] = [] | 34 ppapi_scons_files['trusted_scons_files'] = [] |
| 35 ppapi_scons_files['untrusted_irt_scons_files'] = [] | 35 ppapi_scons_files['untrusted_irt_scons_files'] = [] |
| 36 | 36 |
| 37 ppapi_scons_files['nonvariant_test_scons_files'] = [ | 37 ppapi_scons_files['nonvariant_test_scons_files'] = [ |
| 38 'tests/breakpad_crash_test/nacl.scons', | 38 'tests/breakpad_crash_test/nacl.scons', |
| 39 'tests/ppapi_test_lib/nacl.scons', | |
| 40 ] | 39 ] |
| 41 | 40 |
| 42 ppapi_scons_files['irt_variant_test_scons_files'] = [ | 41 ppapi_scons_files['irt_variant_test_scons_files'] = [ |
| 43 # 'inbrowser_test_runner' must be in the irt_variant list | 42 # 'inbrowser_test_runner' must be in the irt_variant list |
| 44 # otherwise it will run no tests. | 43 # otherwise it will run no tests. |
| 45 'tests/nacl_browser/inbrowser_test_runner/nacl.scons', | 44 'tests/nacl_browser/inbrowser_test_runner/nacl.scons', |
| 46 ] | 45 ] |
| 47 | 46 |
| 48 ppapi_scons_files['untrusted_scons_files'] = [ | 47 ppapi_scons_files['untrusted_scons_files'] = [ |
| 49 'src/shared/ppapi/nacl.scons', | 48 'src/shared/ppapi/nacl.scons', |
| (...skipping 467 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 517 | 516 |
| 518 pre_base_env.AddMethod(PPAPIGraphics3DIsBroken) | 517 pre_base_env.AddMethod(PPAPIGraphics3DIsBroken) |
| 519 | 518 |
| 520 | 519 |
| 521 def AddChromeFilesFromGroup(env, file_group): | 520 def AddChromeFilesFromGroup(env, file_group): |
| 522 env['BUILD_SCONSCRIPTS'] = ExtendFileList( | 521 env['BUILD_SCONSCRIPTS'] = ExtendFileList( |
| 523 env.get('BUILD_SCONSCRIPTS', []), | 522 env.get('BUILD_SCONSCRIPTS', []), |
| 524 ppapi_scons_files[file_group]) | 523 ppapi_scons_files[file_group]) |
| 525 | 524 |
| 526 pre_base_env.AddMethod(AddChromeFilesFromGroup) | 525 pre_base_env.AddMethod(AddChromeFilesFromGroup) |
| OLD | NEW |