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

Side by Side Diff: ppapi/native_client/src/shared/ppapi_proxy/ppapi_proxy_untrusted.gyp

Issue 10837350: Revert 152406 - Introduce shared_memory_support media target for PPAPI. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: 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
Property Changes:
Added: svn:mergeinfo
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 'includes': [ 6 'includes': [
7 '../../../../../native_client/build/common.gypi', 7 '../../../../../native_client/build/common.gypi',
8 ], 8 ],
9 'targets': [ 9 'targets': [
10 { 10 {
11 'target_name': 'ppruntime_lib', 11 'target_name': 'ppruntime_lib',
12 'type': 'none', 12 'type': 'none',
13 'dependencies': [ 13 'dependencies': [
14 '<(DEPTH)/native_client/tools.gyp:prep_toolchain', 14 '<(DEPTH)/native_client/tools.gyp:prep_toolchain'
15 '<(DEPTH)/media/media_untrusted.gyp:shared_memory_support_untrusted',
16 ], 15 ],
17 'variables': { 16 'variables': {
18 'nlib_target': 'libppruntime.a', 17 'nlib_target': 'libppruntime.a',
19 'build_glibc': 0, 18 'build_glibc': 0,
20 'build_newlib': 1, 19 'build_newlib': 1,
21 'include_dirs': [ 20 'include_dirs': [
22 '<(DEPTH)/gpu', 21 '<(DEPTH)/gpu',
23 '<(DEPTH)/media',
24 '<(DEPTH)/third_party/khronos', 22 '<(DEPTH)/third_party/khronos',
25 '<(DEPTH)/ppapi/native_client/src/shared/ppapi_proxy/untrusted', 23 '<(DEPTH)/ppapi/native_client/src/shared/ppapi_proxy/untrusted',
26 ], 24 ],
27 'sources': [ 25 'sources': [
28 '<(DEPTH)/gpu/command_buffer/common/cmd_buffer_common.cc', 26 '<(DEPTH)/gpu/command_buffer/common/cmd_buffer_common.cc',
29 '<(DEPTH)/gpu/command_buffer/common/debug_marker_manager.cc', 27 '<(DEPTH)/gpu/command_buffer/common/debug_marker_manager.cc',
30 '<(DEPTH)/gpu/command_buffer/common/gles2_cmd_format.cc', 28 '<(DEPTH)/gpu/command_buffer/common/gles2_cmd_format.cc',
31 '<(DEPTH)/gpu/command_buffer/common/gles2_cmd_utils.cc', 29 '<(DEPTH)/gpu/command_buffer/common/gles2_cmd_utils.cc',
32 '<(DEPTH)/gpu/command_buffer/common/logging.cc', 30 '<(DEPTH)/gpu/command_buffer/common/logging.cc',
33 31
(...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after
114 'view_data.cc', 112 'view_data.cc',
115 # Autogenerated files 113 # Autogenerated files
116 'ppp_rpc_server.cc', 114 'ppp_rpc_server.cc',
117 'ppb_rpc_client.cc', 115 'ppb_rpc_client.cc',
118 'upcall_client.cc' 116 'upcall_client.cc'
119 ], 117 ],
120 }, 118 },
121 }, 119 },
122 ], 120 ],
123 } 121 }
OLDNEW
« no previous file with comments | « ppapi/native_client/src/shared/ppapi_proxy/plugin_ppb_audio.cc ('k') | ppapi/native_client/src/trusted/plugin/plugin.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698