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

Side by Side Diff: gyp/gpu.gyp

Issue 1213093004: Revert "Move headers used by headers in include/ to include/private." (Closed) Base URL: https://skia.googlesource.com/skia@master
Patch Set: Created 5 years, 5 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
« no previous file with comments | « gyp/example.gyp ('k') | gyp/gputest.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 2015 Google Inc. 1 # Copyright 2015 Google Inc.
2 # 2 #
3 # Use of this source code is governed by a BSD-style license that can be 3 # Use of this source code is governed by a BSD-style license that can be
4 # found in the LICENSE file. 4 # found in the LICENSE file.
5 # GYP for building gpu 5 # GYP for building gpu
6 { 6 {
7 'target_defaults': { 7 'target_defaults': {
8 'conditions': [ 8 'conditions': [
9 ['skia_os != "win"', { 9 ['skia_os != "win"', {
10 'sources/': [ ['exclude', '_win.(h|cpp)$'], 10 'sources/': [ ['exclude', '_win.(h|cpp)$'],
(...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after
87 'core.gyp:*', 87 'core.gyp:*',
88 'utils.gyp:utils', 88 'utils.gyp:utils',
89 'etc1.gyp:libetc1', 89 'etc1.gyp:libetc1',
90 'ktx.gyp:libSkKTX', 90 'ktx.gyp:libSkKTX',
91 ], 91 ],
92 'includes': [ 92 'includes': [
93 'gpu.gypi', 93 'gpu.gypi',
94 ], 94 ],
95 'include_dirs': [ 95 'include_dirs': [
96 '../include/gpu', 96 '../include/gpu',
97 '../include/private',
98 '../src/core', 97 '../src/core',
99 '../src/gpu', 98 '../src/gpu',
100 '../src/image/', 99 '../src/image/',
101 ], 100 ],
102 'sources': [ 101 'sources': [
103 '<@(skgpu_sources)', 102 '<@(skgpu_sources)',
104 '<@(skgpu_native_gl_sources)', 103 '<@(skgpu_native_gl_sources)',
105 '<@(skgpu_angle_gl_sources)', 104 '<@(skgpu_angle_gl_sources)',
106 '<@(skgpu_mesa_gl_sources)', 105 '<@(skgpu_mesa_gl_sources)',
107 '<@(skgpu_debug_gl_sources)', 106 '<@(skgpu_debug_gl_sources)',
(...skipping 112 matching lines...) Expand 10 before | Expand all | Expand 10 after
220 'libraries': [ 219 'libraries': [
221 '-lGLESv2', 220 '-lGLESv2',
222 '-lEGL', 221 '-lEGL',
223 ], 222 ],
224 }, 223 },
225 }], 224 }],
226 ], 225 ],
227 }, 226 },
228 ], 227 ],
229 } 228 }
OLDNEW
« no previous file with comments | « gyp/example.gyp ('k') | gyp/gputest.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698