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

Side by Side Diff: chrome/chrome_dll.gypi

Issue 10694170: Renamed .pak and .rc files (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 5 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 '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 80 matching lines...) Expand 10 before | Expand all | Expand 10 after
91 91
92 # TODO: It would be nice to have these pulled in 92 # TODO: It would be nice to have these pulled in
93 # automatically from direct_dependent_settings in 93 # automatically from direct_dependent_settings in
94 # their various targets (net.gyp:net_resources, etc.), 94 # their various targets (net.gyp:net_resources, etc.),
95 # but that causes errors in other targets when 95 # but that causes errors in other targets when
96 # resulting .res files get referenced multiple times. 96 # resulting .res files get referenced multiple times.
97 '<(SHARED_INTERMEDIATE_DIR)/chrome/browser_resources.rc', 97 '<(SHARED_INTERMEDIATE_DIR)/chrome/browser_resources.rc',
98 '<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc', 98 '<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc',
99 '<(SHARED_INTERMEDIATE_DIR)/chrome/extensions_api_resources.rc', 99 '<(SHARED_INTERMEDIATE_DIR)/chrome/extensions_api_resources.rc',
100 '<(SHARED_INTERMEDIATE_DIR)/chrome/renderer_resources.rc', 100 '<(SHARED_INTERMEDIATE_DIR)/chrome/renderer_resources.rc',
101 '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources_standard.rc', 101 '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources.rc',
102 '<(SHARED_INTERMEDIATE_DIR)/content/content_resources.rc', 102 '<(SHARED_INTERMEDIATE_DIR)/content/content_resources.rc',
103 '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc', 103 '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc',
104 '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources_standar d.rc', 104 '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources.rc',
105 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.rc' , 105 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.rc' ,
106 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources.rc', 106 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources.rc',
107 107
108 # TODO(sgk): left-over from pre-gyp build, figure out 108 # TODO(sgk): left-over from pre-gyp build, figure out
109 # if we still need them and/or how to update to gyp. 109 # if we still need them and/or how to update to gyp.
110 #'app/check_dependents.bat', 110 #'app/check_dependents.bat',
111 #'app/chrome.dll.deps', 111 #'app/chrome.dll.deps',
112 ], 112 ],
113 'include_dirs': [ 113 'include_dirs': [
114 '<(DEPTH)/third_party/wtl/include', 114 '<(DEPTH)/third_party/wtl/include',
(...skipping 169 matching lines...) Expand 10 before | Expand all | Expand 10 after
284 'app/theme/chevron.pdf', 284 'app/theme/chevron.pdf',
285 'app/theme/find_next_Template.pdf', 285 'app/theme/find_next_Template.pdf',
286 'app/theme/find_prev_Template.pdf', 286 'app/theme/find_prev_Template.pdf',
287 'app/theme/menu_hierarchy_arrow.pdf', 287 'app/theme/menu_hierarchy_arrow.pdf',
288 'app/theme/menu_overflow_down.pdf', 288 'app/theme/menu_overflow_down.pdf',
289 'app/theme/menu_overflow_up.pdf', 289 'app/theme/menu_overflow_up.pdf',
290 'app/theme/otr_icon.pdf', 290 'app/theme/otr_icon.pdf',
291 'browser/mac/install.sh', 291 'browser/mac/install.sh',
292 '<(SHARED_INTERMEDIATE_DIR)/repack/chrome.pak', 292 '<(SHARED_INTERMEDIATE_DIR)/repack/chrome.pak',
293 '<(SHARED_INTERMEDIATE_DIR)/repack/resources.pak', 293 '<(SHARED_INTERMEDIATE_DIR)/repack/resources.pak',
294 '<(grit_out_dir)/theme_resources_standard.pak', 294 '<(grit_out_dir)/theme_resources_100_percent.pak',
295 '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources_standar d.pak', 295 '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources_100_per cent.pak',
296 '<!@pymod_do_main(repack_locales -o -g <(grit_out_dir) -s <(SHAR ED_INTERMEDIATE_DIR) -x <(SHARED_INTERMEDIATE_DIR) <(locales))', 296 '<!@pymod_do_main(repack_locales -o -g <(grit_out_dir) -s <(SHAR ED_INTERMEDIATE_DIR) -x <(SHARED_INTERMEDIATE_DIR) <(locales))',
297 # Note: pseudo_locales are generated via the packed_resources 297 # Note: pseudo_locales are generated via the packed_resources
298 # dependency but not copied to the final target. See 298 # dependency but not copied to the final target. See
299 # common.gypi for more info. 299 # common.gypi for more info.
300 ], 300 ],
301 'mac_bundle_resources!': [ 301 'mac_bundle_resources!': [
302 'app/framework-Info.plist', 302 'app/framework-Info.plist',
303 ], 303 ],
304 'dependencies': [ 304 'dependencies': [
305 'app_mode_app', 305 'app_mode_app',
(...skipping 220 matching lines...) Expand 10 before | Expand all | Expand 10 after
526 }, 526 },
527 ], 527 ],
528 }], # mac_keystone 528 }], # mac_keystone
529 ['internal_pdf', { 529 ['internal_pdf', {
530 'dependencies': [ 530 'dependencies': [
531 '../pdf/pdf.gyp:pdf', 531 '../pdf/pdf.gyp:pdf',
532 ], 532 ],
533 }], 533 }],
534 ['enable_hidpi==1', { 534 ['enable_hidpi==1', {
535 'mac_bundle_resources': [ 535 'mac_bundle_resources': [
536 '<(grit_out_dir)/theme_resources_2x.pak', 536 '<(grit_out_dir)/theme_resources_200_percent.pak',
537 '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources_2x. pak', 537 '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources_200 _percent.pak',
538 ], 538 ],
539 }], 539 }],
540 ], # conditions 540 ], # conditions
541 }], # OS=="mac" 541 }], # OS=="mac"
542 ], # conditions 542 ], # conditions
543 }, # target chrome_dll 543 }, # target chrome_dll
544 ], # targets 544 ], # targets
545 }], # OS=="mac" or OS=="win" 545 }], # OS=="mac" or OS=="win"
546 ], 546 ],
547 } 547 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698