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

Side by Side Diff: ash/ash.gyp

Issue 9288053: Remove old (pre-webkit) compositor (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix test Created 8 years, 11 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
« no previous file with comments | « no previous file | ash/test/test_suite.cc » ('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) 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 'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/chrome', 8 'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/chrome',
9 }, 9 },
10 10
(...skipping 175 matching lines...) Expand 10 before | Expand all | Expand 10 after
186 '../base/base.gyp:base', 186 '../base/base.gyp:base',
187 '../base/base.gyp:test_support_base', 187 '../base/base.gyp:test_support_base',
188 '../chrome/chrome_resources.gyp:packed_resources', 188 '../chrome/chrome_resources.gyp:packed_resources',
189 '../build/temp_gyp/googleurl.gyp:googleurl', 189 '../build/temp_gyp/googleurl.gyp:googleurl',
190 '../skia/skia.gyp:skia', 190 '../skia/skia.gyp:skia',
191 '../testing/gtest.gyp:gtest', 191 '../testing/gtest.gyp:gtest',
192 '../third_party/icu/icu.gyp:icui18n', 192 '../third_party/icu/icu.gyp:icui18n',
193 '../third_party/icu/icu.gyp:icuuc', 193 '../third_party/icu/icu.gyp:icuuc',
194 '../ui/aura/aura.gyp:aura', 194 '../ui/aura/aura.gyp:aura',
195 '../ui/aura/aura.gyp:test_support_aura', 195 '../ui/aura/aura.gyp:test_support_aura',
196 '../ui/gfx/compositor/compositor.gyp:compositor',
196 '../ui/gfx/compositor/compositor.gyp:compositor_test_support', 197 '../ui/gfx/compositor/compositor.gyp:compositor_test_support',
197 '../ui/ui.gyp:gfx_resources', 198 '../ui/ui.gyp:gfx_resources',
198 '../ui/ui.gyp:ui', 199 '../ui/ui.gyp:ui',
199 '../ui/ui.gyp:ui_resources', 200 '../ui/ui.gyp:ui_resources',
200 '../ui/ui.gyp:ui_resources_standard', 201 '../ui/ui.gyp:ui_resources_standard',
201 '../ui/views/views.gyp:views', 202 '../ui/views/views.gyp:views',
202 'ash', 203 'ash',
203 ], 204 ],
204 'sources': [ 205 'sources': [
205 '../ui/views/test/test_views_delegate.cc', 206 '../ui/views/test/test_views_delegate.cc',
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
239 'wm/window_modality_controller_unittest.cc', 240 'wm/window_modality_controller_unittest.cc',
240 'wm/workspace_controller_unittest.cc', 241 'wm/workspace_controller_unittest.cc',
241 'wm/workspace/workspace_layout_manager_unittest.cc', 242 'wm/workspace/workspace_layout_manager_unittest.cc',
242 'wm/workspace/workspace_manager_unittest.cc', 243 'wm/workspace/workspace_manager_unittest.cc',
243 244
244 '<(SHARED_INTERMEDIATE_DIR)/ui/gfx/gfx_resources.rc', 245 '<(SHARED_INTERMEDIATE_DIR)/ui/gfx/gfx_resources.rc',
245 '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources.rc', 246 '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources.rc',
246 '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources_standard/ui_resources_standa rd.rc', 247 '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources_standard/ui_resources_standa rd.rc',
247 ], 248 ],
248 'conditions': [ 249 'conditions': [
249 ['use_webkit_compositor==1', {
250 'dependencies': [
251 '../ui/gfx/compositor/compositor.gyp:compositor',
252 ],
253 }, { # use_webkit_compositor!=1
254 'dependencies': [
255 '../ui/gfx/compositor/compositor.gyp:test_compositor',
256 ],
257 }],
258 ['use_ibus==1', { 250 ['use_ibus==1', {
259 'dependencies': [ 251 'dependencies': [
260 '../build/linux/system.gyp:ibus', 252 '../build/linux/system.gyp:ibus',
261 ], 253 ],
262 }], 254 }],
263 ['OS=="mac"', { 255 ['OS=="mac"', {
264 'sources/': [ 256 'sources/': [
265 ['exclude', 'drag_drop/drag_drop_controller_unittest.cc'], 257 ['exclude', 'drag_drop/drag_drop_controller_unittest.cc'],
266 ], 258 ],
267 }], 259 }],
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after
326 'shell/cocoa/app-Info.plist', 318 'shell/cocoa/app-Info.plist',
327 ], 319 ],
328 'xcode_settings': { 320 'xcode_settings': {
329 'INFOPLIST_FILE': 'shell/cocoa/app-Info.plist', 321 'INFOPLIST_FILE': 'shell/cocoa/app-Info.plist',
330 }, 322 },
331 }], 323 }],
332 ], 324 ],
333 }, 325 },
334 ], 326 ],
335 } 327 }
OLDNEW
« no previous file with comments | « no previous file | ash/test/test_suite.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698