| 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 { | 5 { |
| 6 'variables': { | 6 'variables': { |
| 7 'chromium_code': 1, | 7 'chromium_code': 1, |
| 8 }, | 8 }, |
| 9 'includes': [ | 9 'includes': [ |
| 10 '../build/common.gypi', | 10 '../build/common.gypi', |
| (...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 64 'browser/debugger/resources/debugger_resources.grd', | 64 'browser/debugger/resources/debugger_resources.grd', |
| 65 'browser/browser_resources.grd', | 65 'browser/browser_resources.grd', |
| 66 'common/common_resources.grd', | 66 'common/common_resources.grd', |
| 67 'renderer/renderer_resources.grd', | 67 'renderer/renderer_resources.grd', |
| 68 ], | 68 ], |
| 69 'direct_dependent_settings': { | 69 'direct_dependent_settings': { |
| 70 'include_dirs': [ | 70 'include_dirs': [ |
| 71 '<(SHARED_INTERMEDIATE_DIR)/chrome', | 71 '<(SHARED_INTERMEDIATE_DIR)/chrome', |
| 72 ], | 72 ], |
| 73 }, | 73 }, |
| 74 'conditions': [ |
| 75 ['OS=="win"', { |
| 76 'dependencies': ['../build/win/system.gyp:cygwin'], |
| 77 }], |
| 78 ], |
| 74 }, | 79 }, |
| 75 { | 80 { |
| 76 # TODO(mark): It would be better if each static library that needed | 81 # TODO(mark): It would be better if each static library that needed |
| 77 # to run grit would list its own .grd files, but unfortunately some | 82 # to run grit would list its own .grd files, but unfortunately some |
| 78 # of the static libraries currently have circular dependencies among | 83 # of the static libraries currently have circular dependencies among |
| 79 # generated headers. | 84 # generated headers. |
| 80 'target_name': 'chrome_strings', | 85 'target_name': 'chrome_strings', |
| 81 'type': 'none', | 86 'type': 'none', |
| 82 'rules': [ | 87 'rules': [ |
| 83 { | 88 { |
| (...skipping 18 matching lines...) Expand all Loading... |
| 102 'app/resources/locale_settings.grd', | 107 'app/resources/locale_settings.grd', |
| 103 'app/chromium_strings.grd', | 108 'app/chromium_strings.grd', |
| 104 'app/generated_resources.grd', | 109 'app/generated_resources.grd', |
| 105 'app/google_chrome_strings.grd', | 110 'app/google_chrome_strings.grd', |
| 106 ], | 111 ], |
| 107 'direct_dependent_settings': { | 112 'direct_dependent_settings': { |
| 108 'include_dirs': [ | 113 'include_dirs': [ |
| 109 '<(SHARED_INTERMEDIATE_DIR)/chrome', | 114 '<(SHARED_INTERMEDIATE_DIR)/chrome', |
| 110 ], | 115 ], |
| 111 }, | 116 }, |
| 117 'conditions': [ |
| 118 ['OS=="win"', { |
| 119 'dependencies': ['../build/win/system.gyp:cygwin'], |
| 120 }], |
| 121 ], |
| 112 }, | 122 }, |
| 113 { | 123 { |
| 114 # TODO(beng): rename to 'app' when moves to top level. | 124 # TODO(beng): rename to 'app' when moves to top level. |
| 115 'target_name': 'app_base', | 125 'target_name': 'app_base', |
| 116 'type': '<(library)', | 126 'type': '<(library)', |
| 117 'msvs_guid': '4631946D-7D5F-44BD-A5A8-504C0A7033BE', | 127 'msvs_guid': '4631946D-7D5F-44BD-A5A8-504C0A7033BE', |
| 118 'dependencies': [ | 128 'dependencies': [ |
| 119 '../base/base.gyp:base', | 129 '../base/base.gyp:base', |
| 120 '../base/base.gyp:base_gfx', | 130 '../base/base.gyp:base_gfx', |
| 121 '../net/net.gyp:net', | 131 '../net/net.gyp:net', |
| (...skipping 103 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 225 ], | 235 ], |
| 226 'action': ['python', '<(grit_path)', '-i', '<(input_path)', 'build', '
-o', '<(grit_out_dir)'], | 236 'action': ['python', '<(grit_path)', '-i', '<(input_path)', 'build', '
-o', '<(grit_out_dir)'], |
| 227 'message': 'Generating resources from <(input_path)', | 237 'message': 'Generating resources from <(input_path)', |
| 228 }, | 238 }, |
| 229 ], | 239 ], |
| 230 'direct_dependent_settings': { | 240 'direct_dependent_settings': { |
| 231 'include_dirs': [ | 241 'include_dirs': [ |
| 232 '<(SHARED_INTERMEDIATE_DIR)/chrome', | 242 '<(SHARED_INTERMEDIATE_DIR)/chrome', |
| 233 ], | 243 ], |
| 234 }, | 244 }, |
| 245 'conditions': [ |
| 246 ['OS=="win"', { |
| 247 'dependencies': ['../build/win/system.gyp:cygwin'], |
| 248 }], |
| 249 ], |
| 235 }, | 250 }, |
| 236 { | 251 { |
| 237 'target_name': 'common', | 252 'target_name': 'common', |
| 238 'type': '<(library)', | 253 'type': '<(library)', |
| 239 'dependencies': [ | 254 'dependencies': [ |
| 240 'app_base', | 255 'app_base', |
| 241 'chrome_resources', | 256 'chrome_resources', |
| 242 'chrome_strings', | 257 'chrome_strings', |
| 243 '../base/base.gyp:base', | 258 '../base/base.gyp:base', |
| 244 '../base/base.gyp:base_gfx', | 259 '../base/base.gyp:base_gfx', |
| (...skipping 3158 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3403 # Use outputs of this action as inputs for the main target build. | 3418 # Use outputs of this action as inputs for the main target build. |
| 3404 # Seems as a misnomer but makes this happy on Linux (scons). | 3419 # Seems as a misnomer but makes this happy on Linux (scons). |
| 3405 'process_outputs_as_sources': 1, | 3420 'process_outputs_as_sources': 1, |
| 3406 }, | 3421 }, |
| 3407 ], # 'actions' | 3422 ], # 'actions' |
| 3408 }, | 3423 }, |
| 3409 ] | 3424 ] |
| 3410 }], | 3425 }], |
| 3411 ], # 'conditions' | 3426 ], # 'conditions' |
| 3412 } | 3427 } |
| OLD | NEW |