Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1212)

Side by Side Diff: ppapi/ppapi_ipc_proxy_untrusted.gyp

Issue 11170006: Fix the NaCl IPC proxy untrusted side to allow calls off the main thread. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | ppapi/ppapi_ipc_untrusted.gyp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 # This file is named ppapi_ipc_proxy_untrusted.gyp instead of 5 # This file is named ppapi_ipc_proxy_untrusted.gyp instead of
6 # ppapi_proxy_untrusted.gyp, because there is already a file with that name in 6 # ppapi_proxy_untrusted.gyp, because there is already a file with that name in
7 # ppapi/native_client/src/shared/ppapi_proxy. This causes problems on Mac when 7 # ppapi/native_client/src/shared/ppapi_proxy. This causes problems on Mac when
8 # generating for XCode. TODO(dmichael): This file should probably be renamed to 8 # generating for XCode. TODO(dmichael): This file should probably be renamed to
9 # ppapi_proxy_untrusted.gyp when we remove the SRPC NaCl proxy. 9 # ppapi_proxy_untrusted.gyp when we remove the SRPC NaCl proxy.
10 { 10 {
11 'variables': { 11 'variables': {
12 'chromium_code': 1, 12 'chromium_code': 1,
13 # Enable threading for the untrusted side of the proxy.
14 # TODO(bbudge) remove when this is the default.
15 'enable_pepper_threading': '1',
16 }, 13 },
17 'includes': [ 14 'includes': [
18 '../build/common_untrusted.gypi', 15 '../build/common_untrusted.gypi',
19 'ppapi_proxy.gypi', 16 'ppapi_proxy.gypi',
20 ], 17 ],
21 'conditions': [ 18 'conditions': [
22 ['disable_nacl==0 and disable_nacl_untrusted==0', { 19 ['disable_nacl==0 and disable_nacl_untrusted==0', {
23 'targets': [ 20 'targets': [
24 { 21 {
25 'target_name': 'ppapi_proxy_untrusted', 22 'target_name': 'ppapi_proxy_untrusted',
26 'type': 'none', 23 'type': 'none',
27 'variables': { 24 'variables': {
28 'ppapi_proxy_target': 1, 25 'ppapi_proxy_target': 1,
29 'nacl_untrusted_build': 1, 26 'nacl_untrusted_build': 1,
30 'nlib_target': 'libppapi_proxy_untrusted.a', 27 'nlib_target': 'libppapi_proxy_untrusted.a',
31 'build_glibc': 0, 28 'build_glibc': 0,
32 'build_newlib': 1, 29 'build_newlib': 1,
30 'defines': [
31 'NACL_PPAPI_IPC_PROXY',
32 # Enable threading for the untrusted side of the proxy.
33 # TODO(bbudge) remove when this is the default.
34 'ENABLE_PEPPER_THREADING',
35 ],
33 }, 36 },
34 'defines': [
35 'NACL_PPAPI_IPC_PROXY',
36 ],
37 'include_dirs': [ 37 'include_dirs': [
38 '..', 38 '..',
39 '../third_party/khronos', 39 '../third_party/khronos',
40 ], 40 ],
41 'dependencies': [ 41 'dependencies': [
42 '../native_client/tools.gyp:prep_toolchain', 42 '../native_client/tools.gyp:prep_toolchain',
43 '../base/base_untrusted.gyp:base_untrusted', 43 '../base/base_untrusted.gyp:base_untrusted',
44 '../gpu/command_buffer/command_buffer_untrusted.gyp:gles2_utils_untr usted', 44 '../gpu/command_buffer/command_buffer_untrusted.gyp:gles2_utils_untr usted',
45 '../gpu/gpu_untrusted.gyp:command_buffer_client_untrusted', 45 '../gpu/gpu_untrusted.gyp:command_buffer_client_untrusted',
46 '../gpu/gpu_untrusted.gyp:command_buffer_common_untrusted', 46 '../gpu/gpu_untrusted.gyp:command_buffer_common_untrusted',
47 '../gpu/gpu_untrusted.gyp:gles2_implementation_untrusted', 47 '../gpu/gpu_untrusted.gyp:gles2_implementation_untrusted',
48 '../gpu/gpu_untrusted.gyp:gles2_cmd_helper_untrusted', 48 '../gpu/gpu_untrusted.gyp:gles2_cmd_helper_untrusted',
49 '../gpu/gpu_untrusted.gyp:gpu_ipc_untrusted', 49 '../gpu/gpu_untrusted.gyp:gpu_ipc_untrusted',
50 '../ipc/ipc_untrusted.gyp:ipc_untrusted', 50 '../ipc/ipc_untrusted.gyp:ipc_untrusted',
51 '../ppapi/ppapi_shared_untrusted.gyp:ppapi_shared_untrusted', 51 '../ppapi/ppapi_shared_untrusted.gyp:ppapi_shared_untrusted',
52 '../ppapi/ppapi_ipc_untrusted.gyp:ppapi_ipc_untrusted', 52 '../ppapi/ppapi_ipc_untrusted.gyp:ppapi_ipc_untrusted',
53 ], 53 ],
54 }, 54 },
55 ], 55 ],
56 }], 56 }],
57 ], 57 ],
58 } 58 }
OLDNEW
« no previous file with comments | « no previous file | ppapi/ppapi_ipc_untrusted.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698