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

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

Issue 8633020: Revert 111170 - Move GL headers from gpu to third_party/khronos (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 1 month 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/native_client/src/shared/ppapi_proxy/nacl.scons ('k') | third_party/khronos/EGL/egl.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Property Changes:
Deleted: svn:eol-style
- LF
OLDNEW
1 # Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2011 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 {
(...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after
73 'type': 'none', 73 'type': 'none',
74 'dependencies': [ 74 'dependencies': [
75 '<(DEPTH)/native_client/tools.gyp:prep_toolchain' 75 '<(DEPTH)/native_client/tools.gyp:prep_toolchain'
76 ], 76 ],
77 'variables': { 77 'variables': {
78 'nlib_target': 'libppruntime.a', 78 'nlib_target': 'libppruntime.a',
79 'build_glibc': 0, 79 'build_glibc': 0,
80 'build_newlib': 1, 80 'build_newlib': 1,
81 'include_dirs': [ 81 'include_dirs': [
82 '<(DEPTH)/gpu', 82 '<(DEPTH)/gpu',
83 '<(DEPTH)/third_party/khronos',
84 '<(DEPTH)/ppapi/native_client/src/shared/ppapi_proxy/untrusted', 83 '<(DEPTH)/ppapi/native_client/src/shared/ppapi_proxy/untrusted',
85 ], 84 ],
86 'sources': [ 85 'sources': [
87 '<(DEPTH)/gpu/command_buffer/common/cmd_buffer_common.cc', 86 '<(DEPTH)/gpu/command_buffer/common/cmd_buffer_common.cc',
88 '<(DEPTH)/gpu/command_buffer/common/gles2_cmd_format.cc', 87 '<(DEPTH)/gpu/command_buffer/common/gles2_cmd_format.cc',
89 '<(DEPTH)/gpu/command_buffer/common/gles2_cmd_utils.cc', 88 '<(DEPTH)/gpu/command_buffer/common/gles2_cmd_utils.cc',
90 '<(DEPTH)/gpu/command_buffer/common/logging.cc', 89 '<(DEPTH)/gpu/command_buffer/common/logging.cc',
91 90
92 '<(DEPTH)/gpu/command_buffer/client/cmd_buffer_helper.cc', 91 '<(DEPTH)/gpu/command_buffer/client/cmd_buffer_helper.cc',
93 '<(DEPTH)/gpu/command_buffer/client/fenced_allocator.cc', 92 '<(DEPTH)/gpu/command_buffer/client/fenced_allocator.cc',
(...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after
158 'utility.cc', 157 'utility.cc',
159 # Autogenerated files 158 # Autogenerated files
160 'ppp_rpc_server.cc', 159 'ppp_rpc_server.cc',
161 'ppb_rpc_client.cc', 160 'ppb_rpc_client.cc',
162 'upcall_client.cc' 161 'upcall_client.cc'
163 ], 162 ],
164 }, 163 },
165 }, 164 },
166 ], 165 ],
167 } 166 }
OLDNEW
« no previous file with comments | « ppapi/native_client/src/shared/ppapi_proxy/nacl.scons ('k') | third_party/khronos/EGL/egl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698