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

Side by Side Diff: ui/aura/aura.gyp

Issue 10377155: Move ui/gfx/resources to ui/base/native_theme/resources Step2. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: keep gfx_resources.pak for DumpRenderTree Created 8 years, 7 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 | Annotate | Revision Log
OLDNEW
1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 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 'targets': [ 9 'targets': [
10 { 10 {
11 'target_name': 'aura', 11 'target_name': 'aura',
12 'type': '<(component)', 12 'type': '<(component)',
13 'dependencies': [ 13 'dependencies': [
14 '../../base/base.gyp:base', 14 '../../base/base.gyp:base',
15 '../../base/base.gyp:base_i18n', 15 '../../base/base.gyp:base_i18n',
16 '../../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dyna mic_annotations', 16 '../../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dyna mic_annotations',
17 '../../skia/skia.gyp:skia', 17 '../../skia/skia.gyp:skia',
18 '../compositor/compositor.gyp:compositor', 18 '../compositor/compositor.gyp:compositor',
19 '../ui.gyp:gfx_resources', 19 '../ui.gyp:native_theme_resources',
20 '../ui.gyp:ui', 20 '../ui.gyp:ui',
21 '../ui.gyp:ui_resources', 21 '../ui.gyp:ui_resources',
22 '../ui.gyp:ui_resources_2x', 22 '../ui.gyp:ui_resources_2x',
23 '../ui.gyp:ui_resources_standard', 23 '../ui.gyp:ui_resources_standard',
24 ], 24 ],
25 'defines': [ 25 'defines': [
26 'AURA_IMPLEMENTATION', 26 'AURA_IMPLEMENTATION',
27 ], 27 ],
28 'sources': [ 28 'sources': [
29 'aura_switches.cc', 29 'aura_switches.cc',
(...skipping 166 matching lines...) Expand 10 before | Expand all | Expand 10 after
196 'target_name': 'aura_demo', 196 'target_name': 'aura_demo',
197 'type': 'executable', 197 'type': 'executable',
198 'dependencies': [ 198 'dependencies': [
199 '../../base/base.gyp:base', 199 '../../base/base.gyp:base',
200 '../../base/base.gyp:base_i18n', 200 '../../base/base.gyp:base_i18n',
201 '../../skia/skia.gyp:skia', 201 '../../skia/skia.gyp:skia',
202 '../../third_party/icu/icu.gyp:icui18n', 202 '../../third_party/icu/icu.gyp:icui18n',
203 '../../third_party/icu/icu.gyp:icuuc', 203 '../../third_party/icu/icu.gyp:icuuc',
204 '../compositor/compositor.gyp:compositor', 204 '../compositor/compositor.gyp:compositor',
205 '../compositor/compositor.gyp:compositor_test_support', 205 '../compositor/compositor.gyp:compositor_test_support',
206 '../ui.gyp:gfx_resources', 206 '../ui.gyp:native_theme_resources',
207 '../ui.gyp:ui', 207 '../ui.gyp:ui',
208 '../ui.gyp:ui_resources', 208 '../ui.gyp:ui_resources',
209 'aura', 209 'aura',
210 ], 210 ],
211 'include_dirs': [ 211 'include_dirs': [
212 '..', 212 '..',
213 ], 213 ],
214 'sources': [ 214 'sources': [
215 'demo/demo_main.cc', 215 'demo/demo_main.cc',
216 '<(SHARED_INTERMEDIATE_DIR)/ui/gfx/gfx_resources.rc', 216 '<(SHARED_INTERMEDIATE_DIR)/ui/base/native_theme/native_theme_resources. rc',
217 '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources.rc', 217 '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources.rc',
218 ], 218 ],
219 }, 219 },
220 { 220 {
221 'target_name': 'aura_unittests', 221 'target_name': 'aura_unittests',
222 'type': 'executable', 222 'type': 'executable',
223 'dependencies': [ 223 'dependencies': [
224 '../../base/base.gyp:test_support_base', 224 '../../base/base.gyp:test_support_base',
225 '../../chrome/chrome_resources.gyp:packed_resources', 225 '../../chrome/chrome_resources.gyp:packed_resources',
226 '../../skia/skia.gyp:skia', 226 '../../skia/skia.gyp:skia',
227 '../../testing/gtest.gyp:gtest', 227 '../../testing/gtest.gyp:gtest',
228 '../compositor/compositor.gyp:compositor_test_support', 228 '../compositor/compositor.gyp:compositor_test_support',
229 '../compositor/compositor.gyp:compositor', 229 '../compositor/compositor.gyp:compositor',
230 '../gl/gl.gyp:gl', 230 '../gl/gl.gyp:gl',
231 '../ui.gyp:gfx_resources', 231 '../ui.gyp:native_theme_resources',
232 '../ui.gyp:ui', 232 '../ui.gyp:ui',
233 '../ui.gyp:ui_resources', 233 '../ui.gyp:ui_resources',
234 'test_support_aura', 234 'test_support_aura',
235 'aura', 235 'aura',
236 ], 236 ],
237 'include_dirs': [ 237 'include_dirs': [
238 '..', 238 '..',
239 ], 239 ],
240 'sources': [ 240 'sources': [
241 'gestures/gesture_recognizer_unittest.cc', 241 'gestures/gesture_recognizer_unittest.cc',
242 'test/run_all_unittests.cc', 242 'test/run_all_unittests.cc',
243 'test/test_suite.cc', 243 'test/test_suite.cc',
244 'test/test_suite.h', 244 'test/test_suite.h',
245 'root_window_unittest.cc', 245 'root_window_unittest.cc',
246 'shared/input_method_event_filter_unittest.cc', 246 'shared/input_method_event_filter_unittest.cc',
247 'event_filter_unittest.cc', 247 'event_filter_unittest.cc',
248 'event_unittest.cc', 248 'event_unittest.cc',
249 'window_unittest.cc', 249 'window_unittest.cc',
250 '<(SHARED_INTERMEDIATE_DIR)/ui/gfx/gfx_resources.rc', 250 '<(SHARED_INTERMEDIATE_DIR)/ui/native_theme/native_theme_resources.rc',
251 '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources.rc', 251 '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources.rc',
252 ], 252 ],
253 'conditions': [ 253 'conditions': [
254 # osmesa GL implementation is used on linux. 254 # osmesa GL implementation is used on linux.
255 ['OS=="linux"', { 255 ['OS=="linux"', {
256 'dependencies': [ 256 'dependencies': [
257 '<(DEPTH)/third_party/mesa/mesa.gyp:osmesa', 257 '<(DEPTH)/third_party/mesa/mesa.gyp:osmesa',
258 ], 258 ],
259 }], 259 }],
260 ], 260 ],
261 }, 261 },
262 ], 262 ],
263 } 263 }
OLDNEW
« no previous file with comments | « ui/DEPS ('k') | ui/base/native_theme/native_theme_android.cc » ('j') | ui/views/views.gyp » ('J')

Powered by Google App Engine
This is Rietveld 408576698