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

Side by Side Diff: chrome/chrome_resources.gyp

Issue 10905242: add ash_resources.grd and necessary changes to use images in ash/resources (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: presubmit.py Created 8 years, 3 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 '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 246 matching lines...) Expand 10 before | Expand all | Expand 10 after
257 'variables': { 257 'variables': {
258 'repack_path': '../tools/grit/grit/format/repack.py', 258 'repack_path': '../tools/grit/grit/format/repack.py',
259 }, 259 },
260 'dependencies': [ 260 'dependencies': [
261 # MSVS needs the dependencies explictly named, Make is able to 261 # MSVS needs the dependencies explictly named, Make is able to
262 # derive the dependencies from the output files. 262 # derive the dependencies from the output files.
263 'chrome_resources', 263 'chrome_resources',
264 'chrome_strings', 264 'chrome_strings',
265 'platform_locale_settings', 265 'platform_locale_settings',
266 'theme_resources', 266 'theme_resources',
267 # TODO(zork): Protect this with if use_aura==1
268 '<(DEPTH)/ash/ash_strings.gyp:ash_strings',
269 '<(DEPTH)/content/content_resources.gyp:content_resources', 267 '<(DEPTH)/content/content_resources.gyp:content_resources',
270 '<(DEPTH)/net/net.gyp:net_resources', 268 '<(DEPTH)/net/net.gyp:net_resources',
271 '<(DEPTH)/ui/base/strings/ui_strings.gyp:ui_strings', 269 '<(DEPTH)/ui/base/strings/ui_strings.gyp:ui_strings',
272 '<(DEPTH)/ui/ui.gyp:ui_resources', 270 '<(DEPTH)/ui/ui.gyp:ui_resources',
273 '<(DEPTH)/ui/ui.gyp:ui_resources_wallpapers', 271 '<(DEPTH)/ui/ui.gyp:ui_resources_wallpapers',
274 '<(DEPTH)/webkit/support/webkit_support.gyp:webkit_resources', 272 '<(DEPTH)/webkit/support/webkit_support.gyp:webkit_resources',
275 '<(DEPTH)/webkit/support/webkit_support.gyp:webkit_strings', 273 '<(DEPTH)/webkit/support/webkit_support.gyp:webkit_strings',
276 ], 274 ],
277 'actions': [ 275 'actions': [
278 { 276 {
(...skipping 15 matching lines...) Expand all
294 'includes': ['chrome_repack_chrome_touch_100_percent.gypi'] 292 'includes': ['chrome_repack_chrome_touch_100_percent.gypi']
295 }, 293 },
296 { 294 {
297 'includes': ['chrome_repack_chrome_touch_140_percent.gypi'] 295 'includes': ['chrome_repack_chrome_touch_140_percent.gypi']
298 }, 296 },
299 { 297 {
300 'includes': ['chrome_repack_chrome_touch_180_percent.gypi'] 298 'includes': ['chrome_repack_chrome_touch_180_percent.gypi']
301 }, 299 },
302 ], 300 ],
303 'conditions': [ 301 'conditions': [
302 ['use_aura==1', {
303 'dependencies': [
304 '<(DEPTH)/ash/ash.gyp:ash_resources',
305 '<(DEPTH)/ash/ash_strings.gyp:ash_strings',
306 ],
307 }],
304 ['OS != "mac"', { 308 ['OS != "mac"', {
305 # Copy pak files to the product directory. These files will be picked 309 # Copy pak files to the product directory. These files will be picked
306 # up by the following installer scripts: 310 # up by the following installer scripts:
307 # - Windows: chrome/installer/mini_installer/chrome.release 311 # - Windows: chrome/installer/mini_installer/chrome.release
308 # - Linux: chrome/installer/linux/internal/common/installer.include 312 # - Linux: chrome/installer/linux/internal/common/installer.include
309 # Ensure that the above scripts are updated when adding or removing 313 # Ensure that the above scripts are updated when adding or removing
310 # pak files. 314 # pak files.
311 # Copying files to the product directory is not needed on the Mac 315 # Copying files to the product directory is not needed on the Mac
312 # since the framework build phase will copy them into the framework 316 # since the framework build phase will copy them into the framework
313 # bundle directly. 317 # bundle directly.
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after
372 ], 376 ],
373 }, 377 },
374 ], 378 ],
375 }], 379 }],
376 ], # conditions 380 ], # conditions
377 }], # end OS != "mac" 381 }], # end OS != "mac"
378 ], # conditions 382 ], # conditions
379 }, 383 },
380 ], # targets 384 ], # targets
381 } 385 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698