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

Side by Side Diff: gyp/gpu.gyp

Issue 1290553005: Add include paths in gputest.gyp for use by additional gpu tests. (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 5 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
« no previous file with comments | « no previous file | gyp/gputest.gyp » ('j') | gyp/gputest.gyp » ('J')
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 94 matching lines...) Expand 10 before | Expand all | Expand 10 after
105 '<@(skgpu_angle_gl_sources)', 105 '<@(skgpu_angle_gl_sources)',
106 '<@(skgpu_mesa_gl_sources)', 106 '<@(skgpu_mesa_gl_sources)',
107 '<@(skgpu_debug_gl_sources)', 107 '<@(skgpu_debug_gl_sources)',
108 '<@(skgpu_null_gl_sources)', 108 '<@(skgpu_null_gl_sources)',
109 'gpu.gypi', # Makes the gypi appear in IDEs (but does not modify the bui ld). 109 'gpu.gypi', # Makes the gypi appear in IDEs (but does not modify the bui ld).
110 ], 110 ],
111 'conditions': [ 111 'conditions': [
112 [ 'skia_gpu_extra_dependency_path', { 112 [ 'skia_gpu_extra_dependency_path', {
113 'dependencies' : [ 113 'dependencies' : [
114 '<(skia_gpu_extra_dependency_path):*', 114 '<(skia_gpu_extra_dependency_path):*',
115 ] 115 ],
116 'export_dependent_settings': [
117 '<(skia_gpu_extra_dependency_path):*',
118 ],
116 }], 119 }],
117 [ 'skia_chrome_utils', { 120 [ 'skia_chrome_utils', {
118 'sources': [ 121 'sources': [
119 '../experimental/ChromeUtils/SkBorder.cpp', 122 '../experimental/ChromeUtils/SkBorder.cpp',
120 '../experimental/ChromeUtils/SkBorder.h', 123 '../experimental/ChromeUtils/SkBorder.h',
121 ], 124 ],
122 'defines': [ 125 'defines': [
123 'GR_CHROME_UTILS=1', 126 'GR_CHROME_UTILS=1',
124 ], 127 ],
125 }], 128 }],
(...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after
220 'libraries': [ 223 'libraries': [
221 '-lGLESv2', 224 '-lGLESv2',
222 '-lEGL', 225 '-lEGL',
223 ], 226 ],
224 }, 227 },
225 }], 228 }],
226 ], 229 ],
227 }, 230 },
228 ], 231 ],
229 } 232 }
OLDNEW
« no previous file with comments | « no previous file | gyp/gputest.gyp » ('j') | gyp/gputest.gyp » ('J')

Powered by Google App Engine
This is Rietveld 408576698