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

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

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