| OLD | NEW |
| 1 # -*- python -*- | 1 # -*- python -*- |
| 2 # Copyright (c) 2011 The Native Client Authors. All rights reserved. | 2 # Copyright (c) 2011 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 # 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 38 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 49 # Ideally that all happens inside a CompleteBundlePseudoBuilder(). | 49 # Ideally that all happens inside a CompleteBundlePseudoBuilder(). |
| 50 LINKFLAGS = ['-bundle', '-framework', 'Foundation'] | 50 LINKFLAGS = ['-bundle', '-framework', 'Foundation'] |
| 51 ) | 51 ) |
| 52 | 52 |
| 53 if env.Bit('windows'): | 53 if env.Bit('windows'): |
| 54 plugin_env.Append( | 54 plugin_env.Append( |
| 55 CPPDEFINES = ['XP_WIN', 'WIN32', '_WINDOWS'], | 55 CPPDEFINES = ['XP_WIN', 'WIN32', '_WINDOWS'], |
| 56 ) | 56 ) |
| 57 | 57 |
| 58 common_inputs = [ | 58 common_inputs = [ |
| 59 'array_ppapi.cc', | |
| 60 'browser_interface.cc', | |
| 61 'desc_based_handle.cc', | |
| 62 'file_downloader.cc', | 59 'file_downloader.cc', |
| 63 'json_manifest.cc', | 60 'json_manifest.cc', |
| 64 'method_map.cc', | |
| 65 'module_ppapi.cc', | 61 'module_ppapi.cc', |
| 66 'nacl_subprocess.cc', | 62 'nacl_subprocess.cc', |
| 67 'nexe_arch.cc', | 63 'nexe_arch.cc', |
| 68 'plugin.cc', | 64 'plugin.cc', |
| 69 'pnacl_coordinator.cc', | 65 'pnacl_coordinator.cc', |
| 70 'pnacl_resources.cc', | 66 'pnacl_resources.cc', |
| 71 'scriptable_handle.cc', | 67 'scriptable_plugin.cc', |
| 72 'service_runtime.cc', | 68 'service_runtime.cc', |
| 73 'srpc_client.cc', | 69 'srpc_client.cc', |
| 70 'srpc_params.cc', |
| 74 'string_encoding.cc', | 71 'string_encoding.cc', |
| 75 'utility.cc', | 72 'utility.cc', |
| 76 'var_utils.cc', | |
| 77 ] | 73 ] |
| 78 | 74 |
| 79 if env.Bit('target_x86'): | 75 if env.Bit('target_x86'): |
| 80 common_inputs += ['arch_x86/sandbox_isa.cc'] | 76 common_inputs += ['arch_x86/sandbox_isa.cc'] |
| 81 elif env.Bit('target_arm'): | 77 elif env.Bit('target_arm'): |
| 82 common_inputs += ['arch_arm/sandbox_isa.cc'] | 78 common_inputs += ['arch_arm/sandbox_isa.cc'] |
| 83 else: | 79 else: |
| 84 # Unrecognized architecture - this is a build failure. | 80 # Unrecognized architecture - this is a build failure. |
| 85 print "Unrecognized architecture: %s" % env['TARGET_ARCHITECTURE'] | 81 print "Unrecognized architecture: %s" % env['TARGET_ARCHITECTURE'] |
| 86 Return() | 82 Return() |
| (...skipping 106 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 193 unittest_sources, | 189 unittest_sources, |
| 194 no_import_lib=True) | 190 no_import_lib=True) |
| 195 node = env.CommandTest('ppapi_plugin_unittest.out', | 191 node = env.CommandTest('ppapi_plugin_unittest.out', |
| 196 command=[unittest, | 192 command=[unittest, |
| 197 ppapi_plugin, | 193 ppapi_plugin, |
| 198 env['BUILD_ISA_NAME']]) | 194 env['BUILD_ISA_NAME']]) |
| 199 env.AddNodeToTestSuite(node, ['small_tests'], 'run_ppapi_plugin_unittest') | 195 env.AddNodeToTestSuite(node, ['small_tests'], 'run_ppapi_plugin_unittest') |
| 200 | 196 |
| 201 | 197 |
| 202 # TODO(polina,sehr): add a test for the PPAPI plugin on ARM. | 198 # TODO(polina,sehr): add a test for the PPAPI plugin on ARM. |
| OLD | NEW |