| OLD | NEW |
| 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 79 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 90 '../webkit/glue/resources/zoom_in.cur', | 90 '../webkit/glue/resources/zoom_in.cur', |
| 91 '../webkit/glue/resources/zoom_out.cur', | 91 '../webkit/glue/resources/zoom_out.cur', |
| 92 | 92 |
| 93 # TODO: It would be nice to have these pulled in | 93 # TODO: It would be nice to have these pulled in |
| 94 # automatically from direct_dependent_settings in | 94 # automatically from direct_dependent_settings in |
| 95 # their various targets (net.gyp:net_resources, etc.), | 95 # their various targets (net.gyp:net_resources, etc.), |
| 96 # but that causes errors in other targets when | 96 # but that causes errors in other targets when |
| 97 # resulting .res files get referenced multiple times. | 97 # resulting .res files get referenced multiple times. |
| 98 '<(SHARED_INTERMEDIATE_DIR)/chrome/browser_resources.rc', | 98 '<(SHARED_INTERMEDIATE_DIR)/chrome/browser_resources.rc', |
| 99 '<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc', | 99 '<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc', |
| 100 '<(SHARED_INTERMEDIATE_DIR)/chrome/extensions_api_resources.rc', |
| 100 '<(SHARED_INTERMEDIATE_DIR)/chrome/renderer_resources.rc', | 101 '<(SHARED_INTERMEDIATE_DIR)/chrome/renderer_resources.rc', |
| 101 '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources.rc', | 102 '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources.rc', |
| 102 '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources_standard.rc', | 103 '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources_standard.rc', |
| 103 '<(SHARED_INTERMEDIATE_DIR)/content/content_resources.rc', | 104 '<(SHARED_INTERMEDIATE_DIR)/content/content_resources.rc', |
| 104 '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc', | 105 '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc', |
| 105 '<(SHARED_INTERMEDIATE_DIR)/ui/gfx/gfx_resources.rc', | 106 '<(SHARED_INTERMEDIATE_DIR)/ui/gfx/gfx_resources.rc', |
| 106 '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources.rc', | 107 '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources.rc', |
| 107 '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources_standard/ui_resource
s_standard.rc', | 108 '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources_standard/ui_resource
s_standard.rc', |
| 108 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.rc'
, | 109 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.rc'
, |
| 109 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources.rc', | 110 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources.rc', |
| (...skipping 427 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 537 ], | 538 ], |
| 538 }], | 539 }], |
| 539 ], # conditions | 540 ], # conditions |
| 540 }], # OS=="mac" | 541 }], # OS=="mac" |
| 541 ], # conditions | 542 ], # conditions |
| 542 }, # target chrome_dll | 543 }, # target chrome_dll |
| 543 ], # targets | 544 ], # targets |
| 544 }], # OS=="mac" or OS=="win" | 545 }], # OS=="mac" or OS=="win" |
| 545 ], | 546 ], |
| 546 } | 547 } |
| OLD | NEW |