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

Side by Side Diff: chrome/chrome_resources.gyp

Issue 189763002: Remove chrome.pak and its references. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 9 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_repack_chrome.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 'about_credits_file': '<(SHARED_INTERMEDIATE_DIR)/about_credits.html', 7 'about_credits_file': '<(SHARED_INTERMEDIATE_DIR)/about_credits.html',
8 'additional_modules_list_file': '<(SHARED_INTERMEDIATE_DIR)/chrome/browser/i nternal/additional_modules_list.txt', 8 'additional_modules_list_file': '<(SHARED_INTERMEDIATE_DIR)/chrome/browser/i nternal/additional_modules_list.txt',
9 'repack_locales_cmd': ['python', 'tools/build/repack_locales.py'], 9 'repack_locales_cmd': ['python', 'tools/build/repack_locales.py'],
10 }, 10 },
(...skipping 302 matching lines...) Expand 10 before | Expand all | Expand 10 after
313 'type': 'none', 313 'type': 'none',
314 'dependencies': [ 314 'dependencies': [
315 'chrome_unscaled_resources', 315 'chrome_unscaled_resources',
316 'theme_resources_gen', 316 'theme_resources_gen',
317 '<(DEPTH)/ui/resources/ui_resources.gyp:ui_resources', 317 '<(DEPTH)/ui/resources/ui_resources.gyp:ui_resources',
318 ], 318 ],
319 }, 319 },
320 { 320 {
321 'target_name': 'packed_extra_resources', 321 'target_name': 'packed_extra_resources',
322 'type': 'none', 322 'type': 'none',
323 'variables': {
324 'repack_path': '../tools/grit/grit/format/repack.py',
325 },
326 'dependencies': [ 323 'dependencies': [
327 'chrome_extra_resources', 324 'chrome_extra_resources',
328 'packed_resources', 325 'packed_resources',
329 ], 326 ],
330 'actions': [
331 {
332 'includes': ['chrome_repack_resources.gypi']
tfarina 2014/03/07 01:36:00 ops, I shouldn't have removed this line. I'm putti
Nico 2014/03/07 01:38:10 Yah, repack_path above needs to come back too
333 },
334 ],
335 'conditions': [ 327 'conditions': [
336 ['OS != "mac" and OS != "ios"', { 328 ['OS != "mac" and OS != "ios"', {
337 # We'll install the resource files to the product directory. The Mac 329 # We'll install the resource files to the product directory. The Mac
338 # copies the results over as bundle resources in its own special way. 330 # copies the results over as bundle resources in its own special way.
339 'copies': [ 331 'copies': [
340 { 332 {
341 'destination': '<(PRODUCT_DIR)', 333 'destination': '<(PRODUCT_DIR)',
342 'files': [ 334 'files': [
343 '<(SHARED_INTERMEDIATE_DIR)/repack/resources.pak' 335 '<(SHARED_INTERMEDIATE_DIR)/repack/resources.pak'
344 ], 336 ],
(...skipping 15 matching lines...) Expand all
360 'chrome_strings', 352 'chrome_strings',
361 'platform_locale_settings', 353 'platform_locale_settings',
362 'theme_resources', 354 'theme_resources',
363 '<(DEPTH)/components/component_strings.gyp:component_strings', 355 '<(DEPTH)/components/component_strings.gyp:component_strings',
364 '<(DEPTH)/net/net.gyp:net_resources', 356 '<(DEPTH)/net/net.gyp:net_resources',
365 '<(DEPTH)/ui/base/strings/ui_strings.gyp:ui_strings', 357 '<(DEPTH)/ui/base/strings/ui_strings.gyp:ui_strings',
366 '<(DEPTH)/ui/resources/ui_resources.gyp:ui_resources', 358 '<(DEPTH)/ui/resources/ui_resources.gyp:ui_resources',
367 ], 359 ],
368 'actions': [ 360 'actions': [
369 { 361 {
370 'includes': ['chrome_repack_chrome.gypi']
371 },
372 {
373 'includes': ['chrome_repack_locales.gypi'] 362 'includes': ['chrome_repack_locales.gypi']
374 }, 363 },
375 { 364 {
376 'includes': ['chrome_repack_pseudo_locales.gypi'] 365 'includes': ['chrome_repack_pseudo_locales.gypi']
377 }, 366 },
378 { 367 {
379 'includes': ['chrome_repack_chrome_100_percent.gypi'] 368 'includes': ['chrome_repack_chrome_100_percent.gypi']
380 }, 369 },
381 { 370 {
382 'includes': ['chrome_repack_chrome_200_percent.gypi'] 371 'includes': ['chrome_repack_chrome_200_percent.gypi']
(...skipping 115 matching lines...) Expand 10 before | Expand all | Expand 10 after
498 '<(generator_path)', 487 '<(generator_path)',
499 'credits', 488 'credits',
500 '<(about_credits_file)', 489 '<(about_credits_file)',
501 ], 490 ],
502 'message': 'Generating about:credits', 491 'message': 'Generating about:credits',
503 }, 492 },
504 ], 493 ],
505 }, 494 },
506 ], # targets 495 ], # targets
507 } 496 }
OLDNEW
« no previous file with comments | « chrome/chrome_repack_chrome.gypi ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698