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 '../../build/common_untrusted.gypi', | 7 '../../build/common_untrusted.gypi', |
8 ], | 8 ], |
9 'conditions': [ | 9 'conditions': [ |
10 ['disable_nacl==0 and disable_nacl_untrusted==0', { | 10 ['disable_nacl==0 and disable_nacl_untrusted==0', { |
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
69 'lib/gl/include', | 69 'lib/gl/include', |
70 '..', | 70 '..', |
71 ], | 71 ], |
72 'link_flags': [ | 72 'link_flags': [ |
73 '-Wl,--start-group', | 73 '-Wl,--start-group', |
74 '-lirt_browser', | 74 '-lirt_browser', |
75 '-lppruntime', | 75 '-lppruntime', |
76 '-lsrpc', | 76 '-lsrpc', |
77 '-limc_syscalls', | 77 '-limc_syscalls', |
78 '-lplatform', | 78 '-lplatform', |
| 79 '-lbase_untrusted', |
| 80 '-lshared_memory_support_untrusted', |
79 '-lgio', | 81 '-lgio', |
80 '-Wl,--end-group', | 82 '-Wl,--end-group', |
81 '-lm', | 83 '-lm', |
82 ], | 84 ], |
83 # See http://code.google.com/p/nativeclient/issues/detail?id=2691. | 85 # See http://code.google.com/p/nativeclient/issues/detail?id=2691. |
84 # The PNaCl linker (gold) does not implement the "-Ttext-segment" | 86 # The PNaCl linker (gold) does not implement the "-Ttext-segment" |
85 # option. However, with the linker for x86, the "-Ttext" option | 87 # option. However, with the linker for x86, the "-Ttext" option |
86 # does not affect the executable's base address. | 88 # does not affect the executable's base address. |
87 # TODO(olonho): simplify flags handling and avoid duplication | 89 # TODO(olonho): simplify flags handling and avoid duplication |
88 # with NaCl logic. | 90 # with NaCl logic. |
(...skipping 17 matching lines...) Expand all Loading... |
106 ], | 108 ], |
107 'sources': [ | 109 'sources': [ |
108 ], | 110 ], |
109 'extra_args': [ | 111 'extra_args': [ |
110 '--strip-debug', | 112 '--strip-debug', |
111 ], | 113 ], |
112 # TODO(bradchen): get rid of extra_deps64 and extra_deps32 | 114 # TODO(bradchen): get rid of extra_deps64 and extra_deps32 |
113 # once native_client/build/untrusted.gypi no longer needs them. | 115 # once native_client/build/untrusted.gypi no longer needs them. |
114 'extra_deps64': [ | 116 'extra_deps64': [ |
115 '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib64/libppruntime.a', | 117 '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib64/libppruntime.a', |
| 118 '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib64/libbase_untrusted.a', |
116 '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib64/libirt_browser.a', | 119 '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib64/libirt_browser.a', |
| 120 '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib64/libshared_memory_suppo
rt_untrusted.a', |
117 '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib64/libsrpc.a', | 121 '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib64/libsrpc.a', |
118 '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib64/libplatform.a', | 122 '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib64/libplatform.a', |
119 '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib64/libimc_syscalls.a', | 123 '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib64/libimc_syscalls.a', |
120 '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib64/libgio.a', | 124 '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib64/libgio.a', |
121 ], | 125 ], |
122 'extra_deps32': [ | 126 'extra_deps32': [ |
123 '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib32/libppruntime.a', | 127 '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib32/libppruntime.a', |
| 128 '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib32/libbase_untrusted.a', |
124 '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib32/libirt_browser.a', | 129 '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib32/libirt_browser.a', |
| 130 '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib32/libshared_memory_suppo
rt_untrusted.a', |
125 '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib32/libsrpc.a', | 131 '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib32/libsrpc.a', |
126 '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib32/libplatform.a', | 132 '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib32/libplatform.a', |
127 '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib32/libimc_syscalls.a', | 133 '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib32/libimc_syscalls.a', |
128 '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib32/libgio.a', | 134 '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib32/libgio.a', |
129 ], | 135 ], |
130 'extra_deps_newlib64': [ | 136 'extra_deps_newlib64': [ |
131 '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib64/libppruntime.a', | 137 '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib64/libppruntime.a', |
| 138 '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib64/libbase_untrusted.a', |
132 '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib64/libirt_browser.a', | 139 '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib64/libirt_browser.a', |
| 140 '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib64/libshared_memory_suppo
rt_untrusted.a', |
133 '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib64/libsrpc.a', | 141 '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib64/libsrpc.a', |
134 '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib64/libplatform.a', | 142 '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib64/libplatform.a', |
135 '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib64/libimc_syscalls.a', | 143 '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib64/libimc_syscalls.a', |
136 '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib64/libgio.a', | 144 '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib64/libgio.a', |
137 ], | 145 ], |
138 'extra_deps_newlib32': [ | 146 'extra_deps_newlib32': [ |
139 '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib32/libppruntime.a', | 147 '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib32/libppruntime.a', |
| 148 '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib32/libbase_untrusted.a', |
140 '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib32/libirt_browser.a', | 149 '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib32/libirt_browser.a', |
| 150 '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib32/libshared_memory_suppo
rt_untrusted.a', |
141 '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib32/libsrpc.a', | 151 '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib32/libsrpc.a', |
142 '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib32/libplatform.a', | 152 '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib32/libplatform.a', |
143 '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib32/libimc_syscalls.a', | 153 '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib32/libimc_syscalls.a', |
144 '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib32/libgio.a', | 154 '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib32/libgio.a', |
145 ], | 155 ], |
146 'extra_deps_glibc64': [ | 156 'extra_deps_glibc64': [ |
147 '<(SHARED_INTERMEDIATE_DIR)/tc_glibc/lib64/libppruntime.a', | 157 '<(SHARED_INTERMEDIATE_DIR)/tc_glibc/lib64/libppruntime.a', |
| 158 '<(SHARED_INTERMEDIATE_DIR)/tc_glibc/lib64/libbase_untrusted.a', |
148 '<(SHARED_INTERMEDIATE_DIR)/tc_glibc/lib64/libirt_browser.a', | 159 '<(SHARED_INTERMEDIATE_DIR)/tc_glibc/lib64/libirt_browser.a', |
| 160 '<(SHARED_INTERMEDIATE_DIR)/tc_glibc/lib64/libshared_memory_suppor
t_untrusted.a', |
149 '<(SHARED_INTERMEDIATE_DIR)/tc_glibc/lib64/libsrpc.a', | 161 '<(SHARED_INTERMEDIATE_DIR)/tc_glibc/lib64/libsrpc.a', |
150 '<(SHARED_INTERMEDIATE_DIR)/tc_glibc/lib64/libplatform.a', | 162 '<(SHARED_INTERMEDIATE_DIR)/tc_glibc/lib64/libplatform.a', |
151 '<(SHARED_INTERMEDIATE_DIR)/tc_glibc/lib64/libimc_syscalls.a', | 163 '<(SHARED_INTERMEDIATE_DIR)/tc_glibc/lib64/libimc_syscalls.a', |
152 '<(SHARED_INTERMEDIATE_DIR)/tc_glibc/lib64/libgio.a', | 164 '<(SHARED_INTERMEDIATE_DIR)/tc_glibc/lib64/libgio.a', |
153 ], | 165 ], |
154 'extra_deps_glibc32': [ | 166 'extra_deps_glibc32': [ |
155 '<(SHARED_INTERMEDIATE_DIR)/tc_glibc/lib32/libppruntime.a', | 167 '<(SHARED_INTERMEDIATE_DIR)/tc_glibc/lib32/libppruntime.a', |
| 168 '<(SHARED_INTERMEDIATE_DIR)/tc_glibc/lib32/libbase_untrusted.a', |
156 '<(SHARED_INTERMEDIATE_DIR)/tc_glibc/lib32/libirt_browser.a', | 169 '<(SHARED_INTERMEDIATE_DIR)/tc_glibc/lib32/libirt_browser.a', |
| 170 '<(SHARED_INTERMEDIATE_DIR)/tc_glibc/lib32/libshared_memory_suppor
t_untrusted.a', |
157 '<(SHARED_INTERMEDIATE_DIR)/tc_glibc/lib32/libsrpc.a', | 171 '<(SHARED_INTERMEDIATE_DIR)/tc_glibc/lib32/libsrpc.a', |
158 '<(SHARED_INTERMEDIATE_DIR)/tc_glibc/lib32/libplatform.a', | 172 '<(SHARED_INTERMEDIATE_DIR)/tc_glibc/lib32/libplatform.a', |
159 '<(SHARED_INTERMEDIATE_DIR)/tc_glibc/lib32/libimc_syscalls.a', | 173 '<(SHARED_INTERMEDIATE_DIR)/tc_glibc/lib32/libimc_syscalls.a', |
160 '<(SHARED_INTERMEDIATE_DIR)/tc_glibc/lib32/libgio.a', | 174 '<(SHARED_INTERMEDIATE_DIR)/tc_glibc/lib32/libgio.a', |
161 ], | 175 ], |
162 'extra_deps_arm': [ | 176 'extra_deps_arm': [ |
163 '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/libarm/libppruntime.a', | 177 '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/libarm/libppruntime.a', |
| 178 '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/libarm/libbase_untrusted.a', |
164 '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/libarm/libirt_browser.a', | 179 '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/libarm/libirt_browser.a', |
| 180 '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/libarm/libshared_memory_supp
ort_untrusted.a', |
165 '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/libarm/libsrpc.a', | 181 '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/libarm/libsrpc.a', |
166 '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/libarm/libplatform.a', | 182 '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/libarm/libplatform.a', |
167 '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/libarm/libimc_syscalls.a', | 183 '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/libarm/libimc_syscalls.a', |
168 '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/libarm/libgio.a', | 184 '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/libarm/libgio.a', |
169 ], | 185 ], |
170 }, | 186 }, |
171 'dependencies': [ | 187 'dependencies': [ |
172 'src/shared/ppapi_proxy/ppapi_proxy_untrusted.gyp:ppruntime_lib', | 188 'src/shared/ppapi_proxy/ppapi_proxy_untrusted.gyp:ppruntime_lib', |
| 189 '../../base/base_untrusted.gyp:base_untrusted', |
| 190 '../../media/media_untrusted.gyp:shared_memory_support_untrusted', |
173 '../../native_client/src/untrusted/irt/irt.gyp:irt_browser_lib', | 191 '../../native_client/src/untrusted/irt/irt.gyp:irt_browser_lib', |
174 '../../native_client/src/shared/srpc/srpc.gyp:srpc_lib', | 192 '../../native_client/src/shared/srpc/srpc.gyp:srpc_lib', |
175 '../../native_client/src/shared/platform/platform.gyp:platform_lib', | 193 '../../native_client/src/shared/platform/platform.gyp:platform_lib', |
176 '../../native_client/src/untrusted/nacl/nacl.gyp:imc_syscalls_lib', | 194 '../../native_client/src/untrusted/nacl/nacl.gyp:imc_syscalls_lib', |
177 '../../native_client/src/shared/gio/gio.gyp:gio_lib', | 195 '../../native_client/src/shared/gio/gio.gyp:gio_lib', |
178 ], | 196 ], |
179 }, | 197 }, |
180 { | 198 { |
181 'target_name': 'nacl_ipc_irt', | 199 'target_name': 'nacl_ipc_irt', |
182 'type': 'none', | 200 'type': 'none', |
(...skipping 16 matching lines...) Expand all Loading... |
199 '-lppapi_proxy_untrusted', | 217 '-lppapi_proxy_untrusted', |
200 '-lppapi_shared_untrusted', | 218 '-lppapi_shared_untrusted', |
201 '-lgles2_implementation_untrusted', | 219 '-lgles2_implementation_untrusted', |
202 '-lgles2_cmd_helper_untrusted', | 220 '-lgles2_cmd_helper_untrusted', |
203 '-lgles2_utils_untrusted', | 221 '-lgles2_utils_untrusted', |
204 '-lcommand_buffer_client_untrusted', | 222 '-lcommand_buffer_client_untrusted', |
205 '-lcommand_buffer_common_untrusted', | 223 '-lcommand_buffer_common_untrusted', |
206 '-lgpu_ipc_untrusted', | 224 '-lgpu_ipc_untrusted', |
207 '-lipc_untrusted', | 225 '-lipc_untrusted', |
208 '-lbase_untrusted', | 226 '-lbase_untrusted', |
| 227 '-lshared_memory_support_untrusted', |
209 '-lsrpc', | 228 '-lsrpc', |
210 '-limc_syscalls', | 229 '-limc_syscalls', |
211 '-lplatform', | 230 '-lplatform', |
212 '-lgio', | 231 '-lgio', |
213 '-Wl,--end-group', | 232 '-Wl,--end-group', |
214 '-lm', | 233 '-lm', |
215 ], | 234 ], |
216 # See http://code.google.com/p/nativeclient/issues/detail?id=2691. | 235 # See http://code.google.com/p/nativeclient/issues/detail?id=2691. |
217 # The PNaCl linker (gold) does not implement the "-Ttext-segment" | 236 # The PNaCl linker (gold) does not implement the "-Ttext-segment" |
218 # option. However, with the linker for x86, the "-Ttext" option | 237 # option. However, with the linker for x86, the "-Ttext" option |
(...skipping 30 matching lines...) Expand all Loading... |
249 '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib64/libppapi_shared_untrus
ted.a', | 268 '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib64/libppapi_shared_untrus
ted.a', |
250 '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib64/libgles2_implementatio
n_untrusted.a', | 269 '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib64/libgles2_implementatio
n_untrusted.a', |
251 '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib64/libcommand_buffer_clie
nt_untrusted.a', | 270 '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib64/libcommand_buffer_clie
nt_untrusted.a', |
252 '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib64/libcommand_buffer_comm
on_untrusted.a', | 271 '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib64/libcommand_buffer_comm
on_untrusted.a', |
253 '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib64/libgpu_ipc_untrusted.a
', | 272 '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib64/libgpu_ipc_untrusted.a
', |
254 '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib64/libgles2_cmd_helper_un
trusted.a', | 273 '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib64/libgles2_cmd_helper_un
trusted.a', |
255 '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib64/libgles2_utils_untrust
ed.a', | 274 '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib64/libgles2_utils_untrust
ed.a', |
256 '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib64/libipc_untrusted.a', | 275 '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib64/libipc_untrusted.a', |
257 '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib64/libbase_untrusted.a', | 276 '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib64/libbase_untrusted.a', |
258 '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib64/libirt_browser.a', | 277 '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib64/libirt_browser.a', |
| 278 '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib64/libshared_memory_suppo
rt_untrusted.a', |
259 '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib64/libsrpc.a', | 279 '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib64/libsrpc.a', |
260 '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib64/libplatform.a', | 280 '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib64/libplatform.a', |
261 '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib64/libimc_syscalls.a', | 281 '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib64/libimc_syscalls.a', |
262 '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib64/libgio.a', | 282 '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib64/libgio.a', |
263 ], | 283 ], |
264 'extra_deps32': [ | 284 'extra_deps32': [ |
265 '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib32/libppapi_proxy_untrust
ed.a', | 285 '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib32/libppapi_proxy_untrust
ed.a', |
266 '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib32/libppapi_shared_untrus
ted.a', | 286 '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib32/libppapi_shared_untrus
ted.a', |
267 '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib32/libgles2_implementatio
n_untrusted.a', | 287 '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib32/libgles2_implementatio
n_untrusted.a', |
268 '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib32/libcommand_buffer_clie
nt_untrusted.a', | 288 '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib32/libcommand_buffer_clie
nt_untrusted.a', |
269 '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib32/libcommand_buffer_comm
on_untrusted.a', | 289 '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib32/libcommand_buffer_comm
on_untrusted.a', |
270 '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib32/libgpu_ipc_untrusted.a
', | 290 '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib32/libgpu_ipc_untrusted.a
', |
271 '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib32/libgles2_cmd_helper_un
trusted.a', | 291 '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib32/libgles2_cmd_helper_un
trusted.a', |
272 '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib32/libgles2_utils_untrust
ed.a', | 292 '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib32/libgles2_utils_untrust
ed.a', |
273 '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib32/libipc_untrusted.a', | 293 '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib32/libipc_untrusted.a', |
274 '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib32/libbase_untrusted.a', | 294 '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib32/libbase_untrusted.a', |
275 '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib32/libirt_browser.a', | 295 '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib32/libirt_browser.a', |
| 296 '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib32/libshared_memory_suppo
rt_untrusted.a', |
276 '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib32/libsrpc.a', | 297 '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib32/libsrpc.a', |
277 '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib32/libplatform.a', | 298 '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib32/libplatform.a', |
278 '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib32/libimc_syscalls.a', | 299 '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib32/libimc_syscalls.a', |
279 '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib32/libgio.a', | 300 '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib32/libgio.a', |
280 ], | 301 ], |
281 'extra_deps_newlib64': [ | 302 'extra_deps_newlib64': [ |
282 '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib64/libppapi_proxy_untrust
ed.a', | 303 '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib64/libppapi_proxy_untrust
ed.a', |
283 '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib64/libppapi_shared_untrus
ted.a', | 304 '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib64/libppapi_shared_untrus
ted.a', |
284 '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib64/libgles2_implementatio
n_untrusted.a', | 305 '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib64/libgles2_implementatio
n_untrusted.a', |
285 '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib64/libcommand_buffer_clie
nt_untrusted.a', | 306 '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib64/libcommand_buffer_clie
nt_untrusted.a', |
286 '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib64/libcommand_buffer_comm
on_untrusted.a', | 307 '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib64/libcommand_buffer_comm
on_untrusted.a', |
287 '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib64/libgpu_ipc_untrusted.a
', | 308 '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib64/libgpu_ipc_untrusted.a
', |
288 '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib64/libgles2_cmd_helper_un
trusted.a', | 309 '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib64/libgles2_cmd_helper_un
trusted.a', |
289 '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib64/libgles2_utils_untrust
ed.a', | 310 '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib64/libgles2_utils_untrust
ed.a', |
290 '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib64/libipc_untrusted.a', | 311 '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib64/libipc_untrusted.a', |
291 '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib64/libbase_untrusted.a', | 312 '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib64/libbase_untrusted.a', |
292 '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib64/libirt_browser.a', | 313 '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib64/libirt_browser.a', |
| 314 '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib64/libshared_memory_suppo
rt_untrusted.a', |
293 '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib64/libsrpc.a', | 315 '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib64/libsrpc.a', |
294 '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib64/libplatform.a', | 316 '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib64/libplatform.a', |
295 '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib64/libimc_syscalls.a', | 317 '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib64/libimc_syscalls.a', |
296 '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib64/libgio.a', | 318 '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib64/libgio.a', |
297 ], | 319 ], |
298 'extra_deps_newlib32': [ | 320 'extra_deps_newlib32': [ |
299 '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib32/libppapi_proxy_untrust
ed.a', | 321 '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib32/libppapi_proxy_untrust
ed.a', |
300 '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib32/libppapi_shared_untrus
ted.a', | 322 '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib32/libppapi_shared_untrus
ted.a', |
301 '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib32/libgles2_implementatio
n_untrusted.a', | 323 '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib32/libgles2_implementatio
n_untrusted.a', |
302 '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib32/libcommand_buffer_clie
nt_untrusted.a', | 324 '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib32/libcommand_buffer_clie
nt_untrusted.a', |
303 '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib32/libcommand_buffer_comm
on_untrusted.a', | 325 '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib32/libcommand_buffer_comm
on_untrusted.a', |
304 '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib32/libgpu_ipc_untrusted.a
', | 326 '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib32/libgpu_ipc_untrusted.a
', |
305 '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib32/libgles2_cmd_helper_un
trusted.a', | 327 '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib32/libgles2_cmd_helper_un
trusted.a', |
306 '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib32/libgles2_utils_untrust
ed.a', | 328 '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib32/libgles2_utils_untrust
ed.a', |
307 '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib32/libipc_untrusted.a', | 329 '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib32/libipc_untrusted.a', |
308 '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib32/libbase_untrusted.a', | 330 '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib32/libbase_untrusted.a', |
309 '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib32/libirt_browser.a', | 331 '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib32/libirt_browser.a', |
| 332 '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib32/libshared_memory_suppo
rt_untrusted.a', |
310 '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib32/libsrpc.a', | 333 '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib32/libsrpc.a', |
311 '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib32/libplatform.a', | 334 '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib32/libplatform.a', |
312 '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib32/libimc_syscalls.a', | 335 '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib32/libimc_syscalls.a', |
313 '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib32/libgio.a', | 336 '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib32/libgio.a', |
314 ], | 337 ], |
315 'extra_deps_glibc64': [ | 338 'extra_deps_glibc64': [ |
316 '<(SHARED_INTERMEDIATE_DIR)/tc_glibc/lib64/libppapi_proxy_untruste
d.a', | 339 '<(SHARED_INTERMEDIATE_DIR)/tc_glibc/lib64/libppapi_proxy_untruste
d.a', |
317 '<(SHARED_INTERMEDIATE_DIR)/tc_glibc/lib64/libppapi_shared_untrust
ed.a', | 340 '<(SHARED_INTERMEDIATE_DIR)/tc_glibc/lib64/libppapi_shared_untrust
ed.a', |
318 '<(SHARED_INTERMEDIATE_DIR)/tc_glibc/lib64/libgles2_implementation
_untrusted.a', | 341 '<(SHARED_INTERMEDIATE_DIR)/tc_glibc/lib64/libgles2_implementation
_untrusted.a', |
319 '<(SHARED_INTERMEDIATE_DIR)/tc_glibc/lib64/libcommand_buffer_clien
t_untrusted.a', | 342 '<(SHARED_INTERMEDIATE_DIR)/tc_glibc/lib64/libcommand_buffer_clien
t_untrusted.a', |
320 '<(SHARED_INTERMEDIATE_DIR)/tc_glibc/lib64/libcommand_buffer_commo
n_untrusted.a', | 343 '<(SHARED_INTERMEDIATE_DIR)/tc_glibc/lib64/libcommand_buffer_commo
n_untrusted.a', |
321 '<(SHARED_INTERMEDIATE_DIR)/tc_glibc/lib64/libgpu_ipc_untrusted.a'
, | 344 '<(SHARED_INTERMEDIATE_DIR)/tc_glibc/lib64/libgpu_ipc_untrusted.a'
, |
322 '<(SHARED_INTERMEDIATE_DIR)/tc_glibc/lib64/libgles2_cmd_helper_unt
rusted.a', | 345 '<(SHARED_INTERMEDIATE_DIR)/tc_glibc/lib64/libgles2_cmd_helper_unt
rusted.a', |
323 '<(SHARED_INTERMEDIATE_DIR)/tc_glibc/lib64/libgles2_utils_untruste
d.a', | 346 '<(SHARED_INTERMEDIATE_DIR)/tc_glibc/lib64/libgles2_utils_untruste
d.a', |
324 '<(SHARED_INTERMEDIATE_DIR)/tc_glibc/lib64/libipc_untrusted.a', | 347 '<(SHARED_INTERMEDIATE_DIR)/tc_glibc/lib64/libipc_untrusted.a', |
325 '<(SHARED_INTERMEDIATE_DIR)/tc_glibc/lib64/libbase_untrusted.a', | 348 '<(SHARED_INTERMEDIATE_DIR)/tc_glibc/lib64/libbase_untrusted.a', |
326 '<(SHARED_INTERMEDIATE_DIR)/tc_glibc/lib64/libirt_browser.a', | 349 '<(SHARED_INTERMEDIATE_DIR)/tc_glibc/lib64/libirt_browser.a', |
| 350 '<(SHARED_INTERMEDIATE_DIR)/tc_glibc/lib64/libshared_memory_suppor
t_untrusted.a', |
327 '<(SHARED_INTERMEDIATE_DIR)/tc_glibc/lib64/libsrpc.a', | 351 '<(SHARED_INTERMEDIATE_DIR)/tc_glibc/lib64/libsrpc.a', |
328 '<(SHARED_INTERMEDIATE_DIR)/tc_glibc/lib64/libplatform.a', | 352 '<(SHARED_INTERMEDIATE_DIR)/tc_glibc/lib64/libplatform.a', |
329 '<(SHARED_INTERMEDIATE_DIR)/tc_glibc/lib64/libimc_syscalls.a', | 353 '<(SHARED_INTERMEDIATE_DIR)/tc_glibc/lib64/libimc_syscalls.a', |
330 '<(SHARED_INTERMEDIATE_DIR)/tc_glibc/lib64/libgio.a', | 354 '<(SHARED_INTERMEDIATE_DIR)/tc_glibc/lib64/libgio.a', |
331 ], | 355 ], |
332 'extra_deps_glibc32': [ | 356 'extra_deps_glibc32': [ |
333 '<(SHARED_INTERMEDIATE_DIR)/tc_glibc/lib32/libppapi_proxy_untruste
d.a', | 357 '<(SHARED_INTERMEDIATE_DIR)/tc_glibc/lib32/libppapi_proxy_untruste
d.a', |
334 '<(SHARED_INTERMEDIATE_DIR)/tc_glibc/lib32/libppapi_shared_untrust
ed.a', | 358 '<(SHARED_INTERMEDIATE_DIR)/tc_glibc/lib32/libppapi_shared_untrust
ed.a', |
335 '<(SHARED_INTERMEDIATE_DIR)/tc_glibc/lib32/libgles2_implementation
_untrusted.a', | 359 '<(SHARED_INTERMEDIATE_DIR)/tc_glibc/lib32/libgles2_implementation
_untrusted.a', |
336 '<(SHARED_INTERMEDIATE_DIR)/tc_glibc/lib32/libcommand_buffer_clien
t_untrusted.a', | 360 '<(SHARED_INTERMEDIATE_DIR)/tc_glibc/lib32/libcommand_buffer_clien
t_untrusted.a', |
337 '<(SHARED_INTERMEDIATE_DIR)/tc_glibc/lib32/libcommand_buffer_commo
n_untrusted.a', | 361 '<(SHARED_INTERMEDIATE_DIR)/tc_glibc/lib32/libcommand_buffer_commo
n_untrusted.a', |
338 '<(SHARED_INTERMEDIATE_DIR)/tc_glibc/lib32/libgpu_ipc_untrusted.a'
, | 362 '<(SHARED_INTERMEDIATE_DIR)/tc_glibc/lib32/libgpu_ipc_untrusted.a'
, |
339 '<(SHARED_INTERMEDIATE_DIR)/tc_glibc/lib32/libgles2_cmd_helper_unt
rusted.a', | 363 '<(SHARED_INTERMEDIATE_DIR)/tc_glibc/lib32/libgles2_cmd_helper_unt
rusted.a', |
340 '<(SHARED_INTERMEDIATE_DIR)/tc_glibc/lib32/libgles2_utils_untruste
d.a', | 364 '<(SHARED_INTERMEDIATE_DIR)/tc_glibc/lib32/libgles2_utils_untruste
d.a', |
341 '<(SHARED_INTERMEDIATE_DIR)/tc_glibc/lib32/libipc_untrusted.a', | 365 '<(SHARED_INTERMEDIATE_DIR)/tc_glibc/lib32/libipc_untrusted.a', |
342 '<(SHARED_INTERMEDIATE_DIR)/tc_glibc/lib32/libbase_untrusted.a', | 366 '<(SHARED_INTERMEDIATE_DIR)/tc_glibc/lib32/libbase_untrusted.a', |
343 '<(SHARED_INTERMEDIATE_DIR)/tc_glibc/lib32/libirt_browser.a', | 367 '<(SHARED_INTERMEDIATE_DIR)/tc_glibc/lib32/libirt_browser.a', |
| 368 '<(SHARED_INTERMEDIATE_DIR)/tc_glibc/lib32/libshared_memory_suppor
t_untrusted.a', |
344 '<(SHARED_INTERMEDIATE_DIR)/tc_glibc/lib32/libsrpc.a', | 369 '<(SHARED_INTERMEDIATE_DIR)/tc_glibc/lib32/libsrpc.a', |
345 '<(SHARED_INTERMEDIATE_DIR)/tc_glibc/lib32/libplatform.a', | 370 '<(SHARED_INTERMEDIATE_DIR)/tc_glibc/lib32/libplatform.a', |
346 '<(SHARED_INTERMEDIATE_DIR)/tc_glibc/lib32/libimc_syscalls.a', | 371 '<(SHARED_INTERMEDIATE_DIR)/tc_glibc/lib32/libimc_syscalls.a', |
347 '<(SHARED_INTERMEDIATE_DIR)/tc_glibc/lib32/libgio.a', | 372 '<(SHARED_INTERMEDIATE_DIR)/tc_glibc/lib32/libgio.a', |
348 ], | 373 ], |
349 'extra_deps_arm': [ | 374 'extra_deps_arm': [ |
350 '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/libarm/libppapi_proxy_untrus
ted.a', | 375 '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/libarm/libppapi_proxy_untrus
ted.a', |
351 '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/libarm/libppapi_shared_untru
sted.a', | 376 '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/libarm/libppapi_shared_untru
sted.a', |
352 '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/libarm/libgles2_implementati
on_untrusted.a', | 377 '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/libarm/libgles2_implementati
on_untrusted.a', |
353 '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/libarm/libcommand_buffer_cli
ent_untrusted.a', | 378 '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/libarm/libcommand_buffer_cli
ent_untrusted.a', |
354 '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/libarm/libcommand_buffer_com
mon_untrusted.a', | 379 '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/libarm/libcommand_buffer_com
mon_untrusted.a', |
355 '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/libarm/libgpu_ipc_untrusted.
a', | 380 '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/libarm/libgpu_ipc_untrusted.
a', |
356 '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/libarm/libgles2_cmd_helper_u
ntrusted.a', | 381 '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/libarm/libgles2_cmd_helper_u
ntrusted.a', |
357 '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/libarm/libgles2_utils_untrus
ted.a', | 382 '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/libarm/libgles2_utils_untrus
ted.a', |
358 '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/libarm/libipc_untrusted.a', | 383 '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/libarm/libipc_untrusted.a', |
359 '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/libarm/libbase_untrusted.a', | 384 '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/libarm/libbase_untrusted.a', |
360 '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/libarm/libirt_browser.a', | 385 '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/libarm/libirt_browser.a', |
| 386 '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/libarm/libshared_memory_supp
ort_untrusted.a', |
361 '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/libarm/libsrpc.a', | 387 '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/libarm/libsrpc.a', |
362 '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/libarm/libplatform.a', | 388 '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/libarm/libplatform.a', |
363 '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/libarm/libimc_syscalls.a', | 389 '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/libarm/libimc_syscalls.a', |
364 '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/libarm/libgio.a', | 390 '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/libarm/libgio.a', |
365 ], | 391 ], |
366 }, | 392 }, |
367 'dependencies': [ | 393 'dependencies': [ |
368 '../ppapi_ipc_proxy_untrusted.gyp:ppapi_proxy_untrusted', | 394 '../ppapi_ipc_proxy_untrusted.gyp:ppapi_proxy_untrusted', |
369 '../ppapi_shared_untrusted.gyp:ppapi_shared_untrusted', | 395 '../ppapi_shared_untrusted.gyp:ppapi_shared_untrusted', |
370 '../../gpu/command_buffer/command_buffer_untrusted.gyp:gles2_utils_u
ntrusted', | 396 '../../gpu/command_buffer/command_buffer_untrusted.gyp:gles2_utils_u
ntrusted', |
371 '../../gpu/gpu_untrusted.gyp:command_buffer_client_untrusted', | 397 '../../gpu/gpu_untrusted.gyp:command_buffer_client_untrusted', |
372 '../../gpu/gpu_untrusted.gyp:command_buffer_common_untrusted', | 398 '../../gpu/gpu_untrusted.gyp:command_buffer_common_untrusted', |
373 '../../gpu/gpu_untrusted.gyp:gles2_implementation_untrusted', | 399 '../../gpu/gpu_untrusted.gyp:gles2_implementation_untrusted', |
374 '../../gpu/gpu_untrusted.gyp:gles2_cmd_helper_untrusted', | 400 '../../gpu/gpu_untrusted.gyp:gles2_cmd_helper_untrusted', |
375 '../../gpu/gpu_untrusted.gyp:gpu_ipc_untrusted', | 401 '../../gpu/gpu_untrusted.gyp:gpu_ipc_untrusted', |
376 '../../ipc/ipc_untrusted.gyp:ipc_untrusted', | 402 '../../ipc/ipc_untrusted.gyp:ipc_untrusted', |
377 '../../base/base_untrusted.gyp:base_untrusted', | 403 '../../base/base_untrusted.gyp:base_untrusted', |
| 404 '../../media/media_untrusted.gyp:shared_memory_support_untrusted', |
378 '../../native_client/src/untrusted/irt/irt.gyp:irt_browser_lib', | 405 '../../native_client/src/untrusted/irt/irt.gyp:irt_browser_lib', |
379 '../../native_client/src/shared/srpc/srpc.gyp:srpc_lib', | 406 '../../native_client/src/shared/srpc/srpc.gyp:srpc_lib', |
380 '../../native_client/src/shared/platform/platform.gyp:platform_lib', | 407 '../../native_client/src/shared/platform/platform.gyp:platform_lib', |
381 '../../native_client/src/untrusted/nacl/nacl.gyp:imc_syscalls_lib', | 408 '../../native_client/src/untrusted/nacl/nacl.gyp:imc_syscalls_lib', |
382 '../../native_client/src/shared/gio/gio.gyp:gio_lib', | 409 '../../native_client/src/shared/gio/gio.gyp:gio_lib', |
383 ], | 410 ], |
384 }, | 411 }, |
385 ], | 412 ], |
386 }], | 413 }], |
387 ], | 414 ], |
388 } | 415 } |
OLD | NEW |