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

Side by Side Diff: chrome/chrome_dll.gypi

Issue 10825234: Revert 150411 - Repack separate 100 / 200 / touch_100 / touch_200 files into single pak files. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 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 | « build/android/pylib/test_package.py ('k') | chrome/chrome_repack_chrome_100_percent.gypi » ('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 'conditions': [ 5 'conditions': [
6 ['OS=="mac" or OS=="win"', { 6 ['OS=="mac" or OS=="win"', {
7 'targets': [ 7 'targets': [
8 { 8 {
9 'target_name': 'chrome_dll', 9 'target_name': 'chrome_dll',
10 'type': 'none', 10 'type': 'none',
(...skipping 271 matching lines...) Expand 10 before | Expand all | Expand 10 after
282 'app/theme/balloon_wrench.pdf', 282 'app/theme/balloon_wrench.pdf',
283 'app/theme/chevron.pdf', 283 'app/theme/chevron.pdf',
284 'app/theme/find_next_Template.pdf', 284 'app/theme/find_next_Template.pdf',
285 'app/theme/find_prev_Template.pdf', 285 'app/theme/find_prev_Template.pdf',
286 'app/theme/menu_hierarchy_arrow.pdf', 286 'app/theme/menu_hierarchy_arrow.pdf',
287 'app/theme/menu_overflow_down.pdf', 287 'app/theme/menu_overflow_down.pdf',
288 'app/theme/menu_overflow_up.pdf', 288 'app/theme/menu_overflow_up.pdf',
289 'app/theme/otr_icon.pdf', 289 'app/theme/otr_icon.pdf',
290 'browser/mac/install.sh', 290 'browser/mac/install.sh',
291 '<(SHARED_INTERMEDIATE_DIR)/repack/chrome.pak', 291 '<(SHARED_INTERMEDIATE_DIR)/repack/chrome.pak',
292 '<(SHARED_INTERMEDIATE_DIR)/repack/chrome_100_percent.pak',
293 '<(SHARED_INTERMEDIATE_DIR)/repack/resources.pak', 292 '<(SHARED_INTERMEDIATE_DIR)/repack/resources.pak',
293 '<(grit_out_dir)/theme_resources_100_percent.pak',
294 '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources_100_per cent.pak',
294 '<!@pymod_do_main(repack_locales -o -p <(OS) -g <(grit_out_dir) -s <(SHARED_INTERMEDIATE_DIR) -x <(SHARED_INTERMEDIATE_DIR) <(locales))', 295 '<!@pymod_do_main(repack_locales -o -p <(OS) -g <(grit_out_dir) -s <(SHARED_INTERMEDIATE_DIR) -x <(SHARED_INTERMEDIATE_DIR) <(locales))',
295 # Note: pseudo_locales are generated via the packed_resources 296 # Note: pseudo_locales are generated via the packed_resources
296 # dependency but not copied to the final target. See 297 # dependency but not copied to the final target. See
297 # common.gypi for more info. 298 # common.gypi for more info.
298 ], 299 ],
299 'mac_bundle_resources!': [ 300 'mac_bundle_resources!': [
300 'app/framework-Info.plist', 301 'app/framework-Info.plist',
301 ], 302 ],
302 'dependencies': [ 303 'dependencies': [
303 'app_mode_app', 304 'app_mode_app',
(...skipping 220 matching lines...) Expand 10 before | Expand all | Expand 10 after
524 }, 525 },
525 ], 526 ],
526 }], # mac_keystone 527 }], # mac_keystone
527 ['internal_pdf', { 528 ['internal_pdf', {
528 'dependencies': [ 529 'dependencies': [
529 '../pdf/pdf.gyp:pdf', 530 '../pdf/pdf.gyp:pdf',
530 ], 531 ],
531 }], 532 }],
532 ['enable_hidpi==1', { 533 ['enable_hidpi==1', {
533 'mac_bundle_resources': [ 534 'mac_bundle_resources': [
534 '<(SHARED_INTERMEDIATE_DIR)/repack/chrome_200_percent.pak', 535 '<(grit_out_dir)/theme_resources_200_percent.pak',
536 '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources_200 _percent.pak',
537 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources_200_perc ent.pak',
535 ], 538 ],
536 }], 539 }],
537 ], # conditions 540 ], # conditions
538 }], # OS=="mac" 541 }], # OS=="mac"
539 ], # conditions 542 ], # conditions
540 }, # target chrome_dll 543 }, # target chrome_dll
541 ], # targets 544 ], # targets
542 }], # OS=="mac" or OS=="win" 545 }], # OS=="mac" or OS=="win"
543 ], 546 ],
544 } 547 }
OLDNEW
« no previous file with comments | « build/android/pylib/test_package.py ('k') | chrome/chrome_repack_chrome_100_percent.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698