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

Side by Side Diff: media/media_untrusted.gyp

Issue 10826296: Introduce shared_memory_support media target for PPAPI (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Compiles! Created 8 years, 4 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
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 }, 8 },
9 'includes': [ 9 'includes': [
10 '../native_client/build/untrusted.gypi', 10 '../native_client/build/untrusted.gypi',
11 'ppapi_shared.gypi',
DaleCurtis 2012/08/16 23:32:43 For some reason git cl upload thinks I moved this
12 ], 11 ],
13 'conditions': [ 12 'conditions': [
14 ['disable_nacl==0 and disable_nacl_untrusted==0', { 13 ['disable_nacl==0 and disable_nacl_untrusted==0', {
15 'targets': [ 14 'targets': [
16 { 15 {
17 'target_name': 'ppapi_shared_untrusted', 16 'target_name': 'shared_memory_support_untrusted',
18 'type': 'none', 17 'type': 'none',
19 'variables': { 18 'variables': {
20 'ppapi_shared_target': 1,
21 'nacl_untrusted_build': 1, 19 'nacl_untrusted_build': 1,
22 'nlib_target': 'libppapi_shared_untrusted.a', 20 'nlib_target': 'libshared_memory_support_untrusted.a',
23 'build_glibc': 0, 21 'build_glibc': 0,
24 'build_newlib': 1, 22 'build_newlib': 1,
25 }, 23 },
24 'dependencies': [
25 '../native_client/tools.gyp:prep_toolchain',
26 '../base/base_untrusted.gyp:base_untrusted',
27 ],
26 'defines': [ 28 'defines': [
27 'NACL_PPAPI_IPC_PROXY', 29 'MEDIA_IMPLEMENTATION',
28 ], 30 ],
29 'include_dirs': [ 31 'include_dirs': [
30 '..', 32 '..',
31 '../third_party/khronos',
32 ], 33 ],
33 'dependencies': [ 34 'includes': [
34 '../native_client/tools.gyp:prep_toolchain', 35 'shared_memory_support.gypi',
35 '../base/base_untrusted.gyp:base_untrusted', 36 ],
36 '../gpu/command_buffer/command_buffer_untrusted.gyp:gles2_utils_untr usted', 37 'sources': [
37 '../gpu/gpu_untrusted.gyp:command_buffer_client_untrusted', 38 '<@(shared_memory_support_sources)',
38 '../gpu/gpu_untrusted.gyp:gles2_implementation_untrusted',
39 ], 39 ],
40 }, 40 },
41 ], 41 ],
42 }], 42 }],
43 ], 43 ],
44 } 44 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698