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

Side by Side Diff: ppapi/ppapi_shared_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 | « ppapi/ppapi_ipc_untrusted.gyp ('k') | no next file » | 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 { 5 {
6 'variables': { 6 'variables': {
7 'chromium_code': 1, 7 'chromium_code': 1,
8 # Enable threading for the untrusted side of the proxy.
9 # TODO(bbudge) remove when this is the default.
10 'enable_pepper_threading': '1',
11 }, 8 },
12 'includes': [ 9 'includes': [
13 '../build/common_untrusted.gypi', 10 '../build/common_untrusted.gypi',
14 'ppapi_shared.gypi', 11 'ppapi_shared.gypi',
15 ], 12 ],
16 'conditions': [ 13 'conditions': [
17 ['disable_nacl==0 and disable_nacl_untrusted==0', { 14 ['disable_nacl==0 and disable_nacl_untrusted==0', {
18 'targets': [ 15 'targets': [
19 { 16 {
20 'target_name': 'ppapi_shared_untrusted', 17 'target_name': 'ppapi_shared_untrusted',
21 'type': 'none', 18 'type': 'none',
22 'variables': { 19 'variables': {
23 'ppapi_shared_target': 1, 20 'ppapi_shared_target': 1,
24 'nacl_win64_target': 0, 21 'nacl_win64_target': 0,
25 'nacl_untrusted_build': 1, 22 'nacl_untrusted_build': 1,
26 'nlib_target': 'libppapi_shared_untrusted.a', 23 'nlib_target': 'libppapi_shared_untrusted.a',
27 'build_glibc': 0, 24 'build_glibc': 0,
28 'build_newlib': 1, 25 'build_newlib': 1,
26 'defines': [
27 'NACL_PPAPI_IPC_PROXY',
28 # Enable threading for the untrusted side of the proxy.
29 # TODO(bbudge) remove when this is the default.
30 'ENABLE_PEPPER_THREADING',
31 ],
29 }, 32 },
30 'defines': [
31 'NACL_PPAPI_IPC_PROXY',
32 ],
33 'include_dirs': [ 33 'include_dirs': [
34 '..', 34 '..',
35 '../third_party/khronos', 35 '../third_party/khronos',
36 ], 36 ],
37 'dependencies': [ 37 'dependencies': [
38 '../native_client/tools.gyp:prep_toolchain', 38 '../native_client/tools.gyp:prep_toolchain',
39 '../base/base_untrusted.gyp:base_untrusted', 39 '../base/base_untrusted.gyp:base_untrusted',
40 '../gpu/command_buffer/command_buffer_untrusted.gyp:gles2_utils_untr usted', 40 '../gpu/command_buffer/command_buffer_untrusted.gyp:gles2_utils_untr usted',
41 '../gpu/gpu_untrusted.gyp:command_buffer_client_untrusted', 41 '../gpu/gpu_untrusted.gyp:command_buffer_client_untrusted',
42 '../gpu/gpu_untrusted.gyp:gles2_implementation_untrusted', 42 '../gpu/gpu_untrusted.gyp:gles2_implementation_untrusted',
43 '../media/media_untrusted.gyp:shared_memory_support_untrusted', 43 '../media/media_untrusted.gyp:shared_memory_support_untrusted',
44 ], 44 ],
45 }, 45 },
46 ], 46 ],
47 }], 47 }],
48 ], 48 ],
49 } 49 }
OLDNEW
« no previous file with comments | « ppapi/ppapi_ipc_untrusted.gyp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698