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

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: 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
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 112 matching lines...) Expand 10 before | Expand all | Expand 10 after
123 ], 123 ],
124 }], 124 }],
125 ], 125 ],
126 }, 126 },
127 { 127 {
128 'target_name': 'compositor_unittests', 128 'target_name': 'compositor_unittests',
129 'type': 'executable', 129 'type': 'executable',
130 'dependencies': [ 130 'dependencies': [
131 '<(DEPTH)/base/base.gyp:base', 131 '<(DEPTH)/base/base.gyp:base',
132 '<(DEPTH)/base/base.gyp:test_support_base', 132 '<(DEPTH)/base/base.gyp:test_support_base',
133 '<(DEPTH)/chrome/chrome_resources.gyp:packed_resources',
133 '<(DEPTH)/skia/skia.gyp:skia', 134 '<(DEPTH)/skia/skia.gyp:skia',
134 '<(DEPTH)/testing/gtest.gyp:gtest', 135 '<(DEPTH)/testing/gtest.gyp:gtest',
135 '<(DEPTH)/ui/gfx/gl/gl.gyp:gl', 136 '<(DEPTH)/ui/gfx/gl/gl.gyp:gl',
136 '<(DEPTH)/ui/ui.gyp:gfx_resources', 137 '<(DEPTH)/ui/ui.gyp:gfx_resources',
137 '<(DEPTH)/ui/ui.gyp:ui', 138 '<(DEPTH)/ui/ui.gyp:ui',
138 '<(DEPTH)/ui/ui.gyp:ui_resources', 139 '<(DEPTH)/ui/ui.gyp:ui_resources',
139 'compositor', 140 'compositor',
140 'compositor_test_support', 141 'compositor_test_support',
141 'test_compositor', 142 'test_compositor',
142 ], 143 ],
(...skipping 13 matching lines...) Expand all
156 '<(SHARED_INTERMEDIATE_DIR)/ui/gfx/gfx_resources.rc', 157 '<(SHARED_INTERMEDIATE_DIR)/ui/gfx/gfx_resources.rc',
157 '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources.rc', 158 '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources.rc',
158 ], 159 ],
159 'conditions': [ 160 'conditions': [
160 # osmesa GL implementation is used on linux. 161 # osmesa GL implementation is used on linux.
161 ['OS=="linux"', { 162 ['OS=="linux"', {
162 'dependencies': [ 163 'dependencies': [
163 '<(DEPTH)/third_party/mesa/mesa.gyp:osmesa', 164 '<(DEPTH)/third_party/mesa/mesa.gyp:osmesa',
164 ], 165 ],
165 }], 166 }],
166 ['OS!="mac"', {
167 'dependencies': [
168 '<(DEPTH)/chrome/chrome.gyp:packed_resources',
169 ],
170 }],
171 ], 167 ],
172 }, 168 },
173 { 169 {
174 'target_name': 'test_compositor', 170 'target_name': 'test_compositor',
175 'type': 'static_library', 171 'type': 'static_library',
176 'dependencies': [ 172 'dependencies': [
177 '<(DEPTH)/base/base.gyp:base', 173 '<(DEPTH)/base/base.gyp:base',
178 ], 174 ],
179 'sources': [ 175 'sources': [
180 '../test/gfx_test_utils.cc', 176 '../test/gfx_test_utils.cc',
181 '../test/gfx_test_utils.h', 177 '../test/gfx_test_utils.h',
182 ], 178 ],
183 'conditions': [ 179 'conditions': [
184 ['toolkit_views == 1', { 180 ['toolkit_views == 1', {
185 'dependencies': [ 181 'dependencies': [
186 '<(DEPTH)/skia/skia.gyp:skia', 182 '<(DEPTH)/skia/skia.gyp:skia',
187 'compositor', 183 'compositor',
188 ], 184 ],
189 'sources': [ 185 'sources': [
190 'test_compositor.cc', 186 'test_compositor.cc',
191 'test_compositor.h', 187 'test_compositor.h',
192 'test_texture.cc', 188 'test_texture.cc',
193 'test_texture.h', 189 'test_texture.h',
194 ], 190 ],
195 }], 191 }],
196 ], 192 ],
197 }, 193 },
198 ], 194 ],
199 } 195 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698