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

Side by Side Diff: ui/gfx/compositor/compositor.gyp

Issue 8425002: Introduces chromium_resources.gyp to factor out Chrome resource generation (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix linux psuedo_locales output dir. 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 | « ui/aura_shell/aura_shell.gyp ('k') | views/views.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 (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 'variables': { 6 'variables': {
7 'chromium_code': 1, 7 'chromium_code': 1,
8 }, 8 },
9 'target_defaults': { 9 'target_defaults': {
10 'sources/': [ 10 'sources/': [
(...skipping 111 matching lines...) Expand 10 before | Expand all | Expand 10 after
122 ], 122 ],
123 }], 123 }],
124 ], 124 ],
125 }, 125 },
126 { 126 {
127 'target_name': 'compositor_unittests', 127 'target_name': 'compositor_unittests',
128 'type': 'executable', 128 'type': 'executable',
129 'dependencies': [ 129 'dependencies': [
130 '<(DEPTH)/base/base.gyp:base', 130 '<(DEPTH)/base/base.gyp:base',
131 '<(DEPTH)/base/base.gyp:test_support_base', 131 '<(DEPTH)/base/base.gyp:test_support_base',
132 '<(DEPTH)/chrome/chrome_resources.gyp:packed_resources',
132 '<(DEPTH)/skia/skia.gyp:skia', 133 '<(DEPTH)/skia/skia.gyp:skia',
133 '<(DEPTH)/testing/gtest.gyp:gtest', 134 '<(DEPTH)/testing/gtest.gyp:gtest',
134 '<(DEPTH)/ui/gfx/gl/gl.gyp:gl', 135 '<(DEPTH)/ui/gfx/gl/gl.gyp:gl',
135 '<(DEPTH)/ui/ui.gyp:gfx_resources', 136 '<(DEPTH)/ui/ui.gyp:gfx_resources',
136 '<(DEPTH)/ui/ui.gyp:ui', 137 '<(DEPTH)/ui/ui.gyp:ui',
137 '<(DEPTH)/ui/ui.gyp:ui_resources', 138 '<(DEPTH)/ui/ui.gyp:ui_resources',
138 'compositor', 139 'compositor',
139 'compositor_test_support', 140 'compositor_test_support',
140 'test_compositor', 141 'test_compositor',
141 ], 142 ],
(...skipping 17 matching lines...) Expand all
159 '<(SHARED_INTERMEDIATE_DIR)/ui/gfx/gfx_resources.rc', 160 '<(SHARED_INTERMEDIATE_DIR)/ui/gfx/gfx_resources.rc',
160 '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources.rc', 161 '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources.rc',
161 ], 162 ],
162 'conditions': [ 163 'conditions': [
163 # osmesa GL implementation is used on linux. 164 # osmesa GL implementation is used on linux.
164 ['OS=="linux"', { 165 ['OS=="linux"', {
165 'dependencies': [ 166 'dependencies': [
166 '<(DEPTH)/third_party/mesa/mesa.gyp:osmesa', 167 '<(DEPTH)/third_party/mesa/mesa.gyp:osmesa',
167 ], 168 ],
168 }], 169 }],
169 ['OS!="mac"', {
170 'dependencies': [
171 '<(DEPTH)/chrome/chrome.gyp:packed_resources',
172 ],
173 }],
174 ], 170 ],
175 }, 171 },
176 { 172 {
177 'target_name': 'test_compositor', 173 'target_name': 'test_compositor',
178 'type': 'static_library', 174 'type': 'static_library',
179 'dependencies': [ 175 'dependencies': [
180 '<(DEPTH)/base/base.gyp:base', 176 '<(DEPTH)/base/base.gyp:base',
181 ], 177 ],
182 'sources': [ 178 'sources': [
183 '../test/gfx_test_utils.cc', 179 '../test/gfx_test_utils.cc',
184 '../test/gfx_test_utils.h', 180 '../test/gfx_test_utils.h',
185 ], 181 ],
186 'conditions': [ 182 'conditions': [
187 ['toolkit_views == 1', { 183 ['toolkit_views == 1', {
188 'dependencies': [ 184 'dependencies': [
189 '<(DEPTH)/skia/skia.gyp:skia', 185 '<(DEPTH)/skia/skia.gyp:skia',
190 'compositor', 186 'compositor',
191 ], 187 ],
192 'sources': [ 188 'sources': [
193 'test_compositor.cc', 189 'test_compositor.cc',
194 'test_compositor.h', 190 'test_compositor.h',
195 'test_texture.cc', 191 'test_texture.cc',
196 'test_texture.h', 192 'test_texture.h',
197 ], 193 ],
198 }], 194 }],
199 ], 195 ],
200 }, 196 },
201 ], 197 ],
202 } 198 }
OLDNEW
« no previous file with comments | « ui/aura_shell/aura_shell.gyp ('k') | views/views.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698