| OLD | NEW |
| 1 # Copyright (c) 2009 The Chromium Authors. All rights reserved. | 1 # Copyright (c) 2009 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 'target_defaults': { | 5 'target_defaults': { |
| 6 'variables': { | 6 'variables': { |
| 7 'chrome_dll_target': 0, | 7 'chrome_dll_target': 0, |
| 8 }, | 8 }, |
| 9 'target_conditions': [ | 9 'target_conditions': [ |
| 10 ['chrome_dll_target==1', { | 10 ['chrome_dll_target==1', { |
| (...skipping 96 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 107 # automatically from direct_dependent_settings in | 107 # automatically from direct_dependent_settings in |
| 108 # their various targets (net.gyp:net_resources, etc.), | 108 # their various targets (net.gyp:net_resources, etc.), |
| 109 # but that causes errors in other targets when | 109 # but that causes errors in other targets when |
| 110 # resulting .res files get referenced multiple times. | 110 # resulting .res files get referenced multiple times. |
| 111 '<(SHARED_INTERMEDIATE_DIR)/app/app_resources/app_resources.rc', | 111 '<(SHARED_INTERMEDIATE_DIR)/app/app_resources/app_resources.rc', |
| 112 '<(SHARED_INTERMEDIATE_DIR)/chrome/browser_resources.rc', | 112 '<(SHARED_INTERMEDIATE_DIR)/chrome/browser_resources.rc', |
| 113 '<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc', | 113 '<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc', |
| 114 '<(SHARED_INTERMEDIATE_DIR)/chrome/renderer_resources.rc', | 114 '<(SHARED_INTERMEDIATE_DIR)/chrome/renderer_resources.rc', |
| 115 '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources.rc', | 115 '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources.rc', |
| 116 '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc', | 116 '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc', |
| 117 '<(SHARED_INTERMEDIATE_DIR)/webkit/devtools_resources.rc', |
| 117 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources.rc', | 118 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources.rc', |
| 118 | 119 |
| 119 # TODO(sgk): left-over from pre-gyp build, figure out | 120 # TODO(sgk): left-over from pre-gyp build, figure out |
| 120 # if we still need them and/or how to update to gyp. | 121 # if we still need them and/or how to update to gyp. |
| 121 #'app/check_dependents.bat', | 122 #'app/check_dependents.bat', |
| 122 #'app/chrome.dll.deps', | 123 #'app/chrome.dll.deps', |
| 123 ], | 124 ], |
| 124 'msvs_settings': { | 125 'msvs_settings': { |
| 125 'VCLinkerTool': { | 126 'VCLinkerTool': { |
| 126 'ImportLibrary': '$(OutDir)\\lib\\chrome_dll.lib', | 127 'ImportLibrary': '$(OutDir)\\lib\\chrome_dll.lib', |
| (...skipping 155 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 282 { | 283 { |
| 283 'action_name': 'repack_chrome', | 284 'action_name': 'repack_chrome', |
| 284 'variables': { | 285 'variables': { |
| 285 'pak_inputs': [ | 286 'pak_inputs': [ |
| 286 '<(grit_out_dir)/browser_resources.pak', | 287 '<(grit_out_dir)/browser_resources.pak', |
| 287 '<(grit_out_dir)/common_resources.pak', | 288 '<(grit_out_dir)/common_resources.pak', |
| 288 '<(grit_out_dir)/renderer_resources.pak', | 289 '<(grit_out_dir)/renderer_resources.pak', |
| 289 '<(grit_out_dir)/theme_resources.pak', | 290 '<(grit_out_dir)/theme_resources.pak', |
| 290 '<(SHARED_INTERMEDIATE_DIR)/app/app_resources/app_resource
s.pak', | 291 '<(SHARED_INTERMEDIATE_DIR)/app/app_resources/app_resource
s.pak', |
| 291 '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.pak', | 292 '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.pak', |
| 293 '<(SHARED_INTERMEDIATE_DIR)/webkit/devtools_resources.pak'
, |
| 292 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources.pak', | 294 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources.pak', |
| 293 ], | 295 ], |
| 294 }, | 296 }, |
| 295 'inputs': [ | 297 'inputs': [ |
| 296 '<(repack_path)', | 298 '<(repack_path)', |
| 297 '<@(pak_inputs)', | 299 '<@(pak_inputs)', |
| 298 ], | 300 ], |
| 299 'outputs': [ | 301 'outputs': [ |
| 300 '<(INTERMEDIATE_DIR)/repack/chrome.pak', | 302 '<(INTERMEDIATE_DIR)/repack/chrome.pak', |
| 301 ], | 303 ], |
| (...skipping 222 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 524 'configurations': { | 526 'configurations': { |
| 525 'Common_Base': { | 527 'Common_Base': { |
| 526 'msvs_target_platform': 'x64', | 528 'msvs_target_platform': 'x64', |
| 527 }, | 529 }, |
| 528 }, | 530 }, |
| 529 }, # target chrome_dll | 531 }, # target chrome_dll |
| 530 ], | 532 ], |
| 531 }], | 533 }], |
| 532 ], | 534 ], |
| 533 } | 535 } |
| OLD | NEW |