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 'variables': { | 6 'variables': { |
7 'chromium_code': 1, | 7 'chromium_code': 1, |
8 }, | 8 }, |
9 'includes': [ | 9 'includes': [ |
10 '../build/common_untrusted.gypi', | 10 '../build/common_untrusted.gypi', |
11 'ppapi_proxy.gypi', | 11 'ppapi_proxy.gypi', |
12 ], | 12 ], |
13 'conditions': [ | 13 'conditions': [ |
14 ['disable_nacl==0 and disable_nacl_untrusted==0', { | 14 ['disable_nacl==0 and disable_nacl_untrusted==0', { |
15 'targets': [ | 15 'targets': [ |
16 { | 16 { |
17 'target_name': 'ppapi_proxy_untrusted', | 17 'target_name': 'ppapi_proxy_untrusted', |
18 'type': 'none', | 18 'type': 'none', |
19 'variables': { | 19 'variables': { |
20 'ppapi_proxy_target': 1, | 20 'ppapi_proxy_target': 1, |
21 'nacl_untrusted_build': 1, | 21 'nacl_untrusted_build': 1, |
22 'nlib_target': 'libppapi_proxy_untrusted.a', | 22 'nlib_target': 'libppapi_proxy_untrusted.a', |
23 'build_glibc': 0, | 23 'build_glibc': 0, |
24 'build_newlib': 1, | 24 'build_newlib': 1, |
| 25 'defines': [ |
| 26 # Enable threading for the untrusted side of the proxy. |
| 27 # TODO(bbudge) remove when this is the default. |
| 28 'ENABLE_PEPPER_THREADING', |
| 29 ], |
25 }, | 30 }, |
26 'include_dirs': [ | 31 'include_dirs': [ |
27 '..', | 32 '..', |
28 ], | 33 ], |
29 'dependencies': [ | 34 'dependencies': [ |
30 '../native_client/tools.gyp:prep_toolchain', | 35 '../native_client/tools.gyp:prep_toolchain', |
31 '../base/base_untrusted.gyp:base_untrusted', | 36 '../base/base_untrusted.gyp:base_untrusted', |
32 '../gpu/command_buffer/command_buffer_untrusted.gyp:gles2_utils_untr
usted', | 37 '../gpu/command_buffer/command_buffer_untrusted.gyp:gles2_utils_untr
usted', |
33 '../gpu/gpu_untrusted.gyp:command_buffer_client_untrusted', | 38 '../gpu/gpu_untrusted.gyp:command_buffer_client_untrusted', |
34 '../gpu/gpu_untrusted.gyp:command_buffer_common_untrusted', | 39 '../gpu/gpu_untrusted.gyp:command_buffer_common_untrusted', |
35 '../gpu/gpu_untrusted.gyp:gles2_implementation_untrusted', | 40 '../gpu/gpu_untrusted.gyp:gles2_implementation_untrusted', |
36 '../gpu/gpu_untrusted.gyp:gles2_cmd_helper_untrusted', | 41 '../gpu/gpu_untrusted.gyp:gles2_cmd_helper_untrusted', |
37 '../gpu/gpu_untrusted.gyp:gpu_ipc_untrusted', | 42 '../gpu/gpu_untrusted.gyp:gpu_ipc_untrusted', |
38 '../ipc/ipc_untrusted.gyp:ipc_untrusted', | 43 '../ipc/ipc_untrusted.gyp:ipc_untrusted', |
39 '../ppapi/ppapi_shared_untrusted.gyp:ppapi_shared_untrusted', | 44 '../ppapi/ppapi_shared_untrusted.gyp:ppapi_shared_untrusted', |
40 '../ppapi/ppapi_ipc_untrusted.gyp:ppapi_ipc_untrusted', | 45 '../ppapi/ppapi_ipc_untrusted.gyp:ppapi_ipc_untrusted', |
41 '../third_party/khronos/khronos.gyp:khronos_headers', | 46 '../third_party/khronos/khronos.gyp:khronos_headers', |
42 '../components/tracing_untrusted.gyp:tracing_untrusted', | 47 '../components/tracing_untrusted.gyp:tracing_untrusted', |
43 ], | 48 ], |
44 }, | 49 }, |
45 ], | 50 ], |
46 }], | 51 }], |
47 ], | 52 ], |
48 } | 53 } |
OLD | NEW |