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

Side by Side Diff: chrome/chrome_resources.gyp

Issue 22339020: Remove chrome.pak references, build resources into resources.pak (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Remove chrome.pak references so 'all' builds Created 7 years, 4 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_resources.gypi ('k') | chrome/common/descriptors_android.h » ('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 '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 'repack_locales_cmd': ['python', 'tools/build/repack_locales.py'], 8 'repack_locales_cmd': ['python', 'tools/build/repack_locales.py'],
9 }, 9 },
10 'targets': [ 10 'targets': [
(...skipping 301 matching lines...) Expand 10 before | Expand all | Expand 10 after
312 'chrome_strings', 312 'chrome_strings',
313 'platform_locale_settings', 313 'platform_locale_settings',
314 'theme_resources', 314 'theme_resources',
315 '<(DEPTH)/components/component_strings.gyp:component_strings', 315 '<(DEPTH)/components/component_strings.gyp:component_strings',
316 '<(DEPTH)/net/net.gyp:net_resources', 316 '<(DEPTH)/net/net.gyp:net_resources',
317 '<(DEPTH)/ui/base/strings/ui_strings.gyp:ui_strings', 317 '<(DEPTH)/ui/base/strings/ui_strings.gyp:ui_strings',
318 '<(DEPTH)/ui/ui.gyp:ui_resources', 318 '<(DEPTH)/ui/ui.gyp:ui_resources',
319 ], 319 ],
320 'actions': [ 320 'actions': [
321 { 321 {
322 'includes': ['chrome_repack_chrome.gypi']
323 },
324 {
325 'includes': ['chrome_repack_locales.gypi'] 322 'includes': ['chrome_repack_locales.gypi']
326 }, 323 },
327 { 324 {
328 'includes': ['chrome_repack_pseudo_locales.gypi'] 325 'includes': ['chrome_repack_pseudo_locales.gypi']
329 }, 326 },
330 { 327 {
331 'includes': ['chrome_repack_chrome_100_percent.gypi'] 328 'includes': ['chrome_repack_chrome_100_percent.gypi']
332 }, 329 },
333 { 330 {
334 'includes': ['chrome_repack_chrome_200_percent.gypi'] 331 'includes': ['chrome_repack_chrome_200_percent.gypi']
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
366 # - Linux: chrome/installer/linux/internal/common/installer.include 363 # - Linux: chrome/installer/linux/internal/common/installer.include
367 # Ensure that the above scripts are updated when adding or removing 364 # Ensure that the above scripts are updated when adding or removing
368 # pak files. 365 # pak files.
369 # Copying files to the product directory is not needed on the Mac 366 # Copying files to the product directory is not needed on the Mac
370 # since the framework build phase will copy them into the framework 367 # since the framework build phase will copy them into the framework
371 # bundle directly. 368 # bundle directly.
372 'copies': [ 369 'copies': [
373 { 370 {
374 'destination': '<(PRODUCT_DIR)', 371 'destination': '<(PRODUCT_DIR)',
375 'files': [ 372 'files': [
376 '<(SHARED_INTERMEDIATE_DIR)/repack/chrome.pak'
377 ],
378 },
379 {
380 'destination': '<(PRODUCT_DIR)',
381 'files': [
382 '<(SHARED_INTERMEDIATE_DIR)/repack/chrome_100_percent.pak' 373 '<(SHARED_INTERMEDIATE_DIR)/repack/chrome_100_percent.pak'
383 ], 374 ],
384 }, 375 },
385 { 376 {
386 'destination': '<(PRODUCT_DIR)/locales', 377 'destination': '<(PRODUCT_DIR)/locales',
387 'files': [ 378 'files': [
388 '<!@pymod_do_main(repack_locales -o -p <(OS) -g <(grit_out_dir) -s <(SHARED_INTERMEDIATE_DIR) -x <(SHARED_INTERMEDIATE_DIR) <(locales))' 379 '<!@pymod_do_main(repack_locales -o -p <(OS) -g <(grit_out_dir) -s <(SHARED_INTERMEDIATE_DIR) -x <(SHARED_INTERMEDIATE_DIR) <(locales))'
389 ], 380 ],
390 }, 381 },
391 { 382 {
(...skipping 81 matching lines...) Expand 10 before | Expand all | Expand 10 after
473 '<(generator_path)', 464 '<(generator_path)',
474 'credits', 465 'credits',
475 '<(about_credits_file)', 466 '<(about_credits_file)',
476 ], 467 ],
477 'message': 'Generating about:credits.', 468 'message': 'Generating about:credits.',
478 }, 469 },
479 ], 470 ],
480 }, 471 },
481 ], # targets 472 ], # targets
482 } 473 }
OLDNEW
« no previous file with comments | « chrome/chrome_repack_resources.gypi ('k') | chrome/common/descriptors_android.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698