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

Side by Side Diff: chrome/chrome_resources.gyp

Issue 11026075: Include wallpaper to win_aura's executables (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 2 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 | « chrome/chrome_dll.gypi ('k') | no next file » | 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 'variables': { 5 'variables': {
6 'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/chrome', 6 'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/chrome',
7 'repack_locales_cmd': ['python', 'tools/build/repack_locales.py'], 7 'repack_locales_cmd': ['python', 'tools/build/repack_locales.py'],
8 }, 8 },
9 'targets': [ 9 'targets': [
10 { 10 {
(...skipping 282 matching lines...) Expand 10 before | Expand all | Expand 10 after
293 'includes': ['chrome_repack_chrome_touch_100_percent.gypi'] 293 'includes': ['chrome_repack_chrome_touch_100_percent.gypi']
294 }, 294 },
295 { 295 {
296 'includes': ['chrome_repack_chrome_touch_140_percent.gypi'] 296 'includes': ['chrome_repack_chrome_touch_140_percent.gypi']
297 }, 297 },
298 { 298 {
299 'includes': ['chrome_repack_chrome_touch_180_percent.gypi'] 299 'includes': ['chrome_repack_chrome_touch_180_percent.gypi']
300 }, 300 },
301 ], 301 ],
302 'conditions': [ 302 'conditions': [
303 ['use_aura==1', { 303 ['use_ash==1', {
304 'dependencies': [ 304 'dependencies': [
305 '<(DEPTH)/ash/ash.gyp:ash_resources', 305 '<(DEPTH)/ash/ash.gyp:ash_resources',
306 '<(DEPTH)/ash/ash.gyp:ash_wallpaper_resources', 306 '<(DEPTH)/ash/ash.gyp:ash_wallpaper_resources',
307 ], 307 ],
308 }], 308 }],
309 ['OS != "mac"', { 309 ['OS != "mac"', {
310 # Copy pak files to the product directory. These files will be picked 310 # Copy pak files to the product directory. These files will be picked
311 # up by the following installer scripts: 311 # up by the following installer scripts:
312 # - Windows: chrome/installer/mini_installer/chrome.release 312 # - Windows: chrome/installer/mini_installer/chrome.release
313 # - Linux: chrome/installer/linux/internal/common/installer.include 313 # - Linux: chrome/installer/linux/internal/common/installer.include
(...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after
377 ], 377 ],
378 }, 378 },
379 ], 379 ],
380 }], 380 }],
381 ], # conditions 381 ], # conditions
382 }], # end OS != "mac" 382 }], # end OS != "mac"
383 ], # conditions 383 ], # conditions
384 }, 384 },
385 ], # targets 385 ], # targets
386 } 386 }
OLDNEW
« no previous file with comments | « chrome/chrome_dll.gypi ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698