Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 # Use of this source code is governed by a BSD-style license that can be | 2 # Use of this source code is governed by a BSD-style license that can be |
| 3 # found in the LICENSE file. | 3 # found in the LICENSE file. |
| 4 | 4 |
| 5 { | 5 { |
| 6 'includes': [ | 6 'includes': [ |
| 7 'nacl_browser_test.gypi', | 7 'nacl_browser_test.gypi', |
| 8 ], | 8 ], |
| 9 'targets': [ | 9 'targets': [ |
| 10 { | 10 { |
| (...skipping 109 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 120 'pnacl_nmf_options/pnacl_o_0.nmf', | 120 'pnacl_nmf_options/pnacl_o_0.nmf', |
| 121 'pnacl_nmf_options/pnacl_o_2.nmf', | 121 'pnacl_nmf_options/pnacl_o_2.nmf', |
| 122 'pnacl_nmf_options/pnacl_o_large.nmf', | 122 'pnacl_nmf_options/pnacl_o_large.nmf', |
| 123 'pnacl_nmf_options/pnacl_time_passes.nmf', | 123 'pnacl_nmf_options/pnacl_time_passes.nmf', |
| 124 ], | 124 ], |
| 125 }, | 125 }, |
| 126 'dependencies': [ | 126 'dependencies': [ |
| 127 '<(DEPTH)/native_client/tools.gyp:prep_toolchain', | 127 '<(DEPTH)/native_client/tools.gyp:prep_toolchain', |
| 128 ] | 128 ] |
| 129 }, | 129 }, |
| 130 { | |
| 131 'target_name': 'pnacl_dyncode_syscall_disabled_test', | |
| 132 'type': 'none', | |
| 133 'variables': { | |
| 134 'enable_x86_32': 0, | |
|
jvoung (off chromium)
2013/04/23 22:43:27
Maybe add a comment that these "enable_*: 0" are t
sehr
2013/04/24 15:34:25
Done.
| |
| 135 'enable_x86_64': 0, | |
| 136 'enable_arm': 0, | |
|
bradn
2013/04/23 22:47:52
This just landed which will require you to change
sehr
2013/04/24 15:34:25
That change was reverted. So we're racing :-)
| |
| 137 'nexe_target': 'pnacl_dyncode_syscall_disabled', | |
| 138 'build_pnacl_newlib': 1, | |
| 139 'link_flags': [ | |
| 140 '-lppapi', | |
|
bradn
2013/04/23 22:47:52
You probably don't need -lppapi after the rebase.
sehr
2013/04/24 15:34:25
Ditto.
| |
| 141 '-lppapi_test_lib', | |
| 142 '-lplatform', | |
| 143 '-lgio', | |
| 144 '-lnacl_dyncode', | |
| 145 ], | |
| 146 'sources': [ | |
| 147 'pnacl_dyncode_syscall_disabled/pnacl_dyncode_syscall_disabled.cc', | |
| 148 ], | |
| 149 'test_files': [ | |
| 150 'pnacl_dyncode_syscall_disabled/pnacl_dyncode_syscall_disabled.html', | |
| 151 ], | |
| 152 }, | |
| 153 'dependencies': [ | |
| 154 '<(DEPTH)/native_client/tools.gyp:prep_toolchain', | |
| 155 '<(DEPTH)/native_client/src/shared/platform/platform.gyp:platform_lib', | |
| 156 '<(DEPTH)/native_client/src/shared/gio/gio.gyp:gio_lib', | |
| 157 '<(DEPTH)/ppapi/native_client/native_client.gyp:ppapi_lib', | |
|
jvoung (off chromium)
2013/04/23 22:43:27
nit: sort this list?
sehr
2013/04/24 15:34:25
Done.
| |
| 158 '<(DEPTH)/native_client/src/untrusted/nacl/nacl.gyp:nacl_dynacode_lib', | |
| 159 '<(DEPTH)/ppapi/ppapi_untrusted.gyp:ppapi_cpp_lib', | |
| 160 'ppapi_test_lib', | |
| 161 ], | |
| 162 }, | |
| 130 # Legacy NaCl PPAPI interface tests being here. | 163 # Legacy NaCl PPAPI interface tests being here. |
| 131 { | 164 { |
| 132 'target_name': 'ppapi_ppb_core', | 165 'target_name': 'ppapi_ppb_core', |
| 133 'type': 'none', | 166 'type': 'none', |
| 134 'variables': { | 167 'variables': { |
| 135 'nexe_target': 'ppapi_ppb_core', | 168 'nexe_target': 'ppapi_ppb_core', |
| 136 'build_newlib': 1, | 169 'build_newlib': 1, |
| 137 'build_glibc': 1, | 170 'build_glibc': 1, |
| 138 'build_pnacl_newlib': 1, | 171 'build_pnacl_newlib': 1, |
| 139 'link_flags': [ | 172 'link_flags': [ |
| (...skipping 13 matching lines...) Expand all Loading... | |
| 153 '<(DEPTH)/native_client/tools.gyp:prep_toolchain', | 186 '<(DEPTH)/native_client/tools.gyp:prep_toolchain', |
| 154 '<(DEPTH)/native_client/src/shared/platform/platform.gyp:platform_lib', | 187 '<(DEPTH)/native_client/src/shared/platform/platform.gyp:platform_lib', |
| 155 '<(DEPTH)/native_client/src/shared/gio/gio.gyp:gio_lib', | 188 '<(DEPTH)/native_client/src/shared/gio/gio.gyp:gio_lib', |
| 156 '<(DEPTH)/ppapi/native_client/native_client.gyp:ppapi_lib', | 189 '<(DEPTH)/ppapi/native_client/native_client.gyp:ppapi_lib', |
| 157 '<(DEPTH)/ppapi/ppapi_untrusted.gyp:ppapi_cpp_lib', | 190 '<(DEPTH)/ppapi/ppapi_untrusted.gyp:ppapi_cpp_lib', |
| 158 'ppapi_test_lib', | 191 'ppapi_test_lib', |
| 159 ], | 192 ], |
| 160 }, | 193 }, |
| 161 ], | 194 ], |
| 162 } | 195 } |
| OLD | NEW |