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

Side by Side Diff: ui/compositor/compositor.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 {
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
54 'screen_rotation.h', 54 'screen_rotation.h',
55 # UI tests need TestWebGraphicsContext3D, so we always build it. 55 # UI tests need TestWebGraphicsContext3D, so we always build it.
56 'test_web_graphics_context_3d.cc', 56 'test_web_graphics_context_3d.cc',
57 'test_web_graphics_context_3d.h', 57 'test_web_graphics_context_3d.h',
58 ], 58 ],
59 'conditions': [ 59 'conditions': [
60 ['OS == "win" and use_aura == 1', { 60 ['OS == "win" and use_aura == 1', {
61 # TODO(sky): before we make this real need to remove 61 # TODO(sky): before we make this real need to remove
62 # IDR_BITMAP_BRUSH_IMAGE. 62 # IDR_BITMAP_BRUSH_IMAGE.
63 'dependencies': [ 63 'dependencies': [
64 '<(DEPTH)/ui/ui.gyp:gfx_resources', 64 '<(DEPTH)/ui/ui.gyp:native_theme_resources',
65 '<(DEPTH)/third_party/angle/src/build_angle.gyp:libEGL', 65 '<(DEPTH)/third_party/angle/src/build_angle.gyp:libEGL',
66 '<(DEPTH)/third_party/angle/src/build_angle.gyp:libGLESv2', 66 '<(DEPTH)/third_party/angle/src/build_angle.gyp:libGLESv2',
67 ], 67 ],
68 }], 68 }],
69 ], 69 ],
70 }, 70 },
71 { 71 {
72 'target_name': 'compositor_test_support', 72 'target_name': 'compositor_test_support',
73 'type': 'static_library', 73 'type': 'static_library',
74 'dependencies': [ 74 'dependencies': [
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
116 'test/test_compositor_host_mac.mm', 116 'test/test_compositor_host_mac.mm',
117 'test/test_compositor_host_win.cc', 117 'test/test_compositor_host_win.cc',
118 'test/test_layer_animation_delegate.cc', 118 'test/test_layer_animation_delegate.cc',
119 'test/test_layer_animation_delegate.h', 119 'test/test_layer_animation_delegate.h',
120 'test/test_layer_animation_observer.cc', 120 'test/test_layer_animation_observer.cc',
121 'test/test_layer_animation_observer.h', 121 'test/test_layer_animation_observer.h',
122 'test/test_suite.cc', 122 'test/test_suite.cc',
123 'test/test_suite.h', 123 'test/test_suite.h',
124 'test/test_utils.cc', 124 'test/test_utils.cc',
125 'test/test_utils.h', 125 'test/test_utils.h',
126 '<(SHARED_INTERMEDIATE_DIR)/ui/gfx/gfx_resources.rc', 126 '<(SHARED_INTERMEDIATE_DIR)/ui/native_theme/native_theme_resources.rc',
127 '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources.rc' 127 '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources.rc'
128 ], 128 ],
129 'conditions': [ 129 'conditions': [
130 # osmesa GL implementation is used on linux. 130 # osmesa GL implementation is used on linux.
131 ['OS=="linux"', { 131 ['OS=="linux"', {
132 'dependencies': [ 132 'dependencies': [
133 '<(DEPTH)/third_party/mesa/mesa.gyp:osmesa', 133 '<(DEPTH)/third_party/mesa/mesa.gyp:osmesa',
134 ], 134 ],
135 }], 135 }],
136 ], 136 ],
137 }, 137 },
138 ], 138 ],
139 } 139 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698