| OLD | NEW |
| 1 # Copyright 2014 The Chromium Authors. All rights reserved. | 1 # Copyright 2014 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 import("//build/config/features.gni") | 5 import("//build/config/features.gni") |
| 6 import("//build/config/ui.gni") | 6 import("//build/config/ui.gni") |
| 7 import("//chrome/version.gni") | 7 import("//chrome/version.gni") |
| 8 | 8 |
| 9 # TODO(GYP) for Windows need to the the reorder-imports step which probably | 9 # TODO(GYP) for Windows need to the the reorder-imports step which probably |
| 10 # means adding another target and renaming this to chrome_initial like in GYP. | 10 # means adding another target and renaming this to chrome_initial like in GYP. |
| (...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 105 "app/delay_load_hook_win.cc", | 105 "app/delay_load_hook_win.cc", |
| 106 "app/delay_load_hook_win.h", | 106 "app/delay_load_hook_win.h", |
| 107 "//base/win/dllmain.cc", | 107 "//base/win/dllmain.cc", |
| 108 ] | 108 ] |
| 109 | 109 |
| 110 deps += [ | 110 deps += [ |
| 111 # On Windows, link the dependencies (libraries) that make up actual | 111 # On Windows, link the dependencies (libraries) that make up actual |
| 112 # Chromium functionality into this .dll. | 112 # Chromium functionality into this .dll. |
| 113 #'chrome_version_resources', TODO(GYP) | 113 #'chrome_version_resources', TODO(GYP) |
| 114 "//chrome/app/theme:chrome_unscaled_resources", | 114 "//chrome/app/theme:chrome_unscaled_resources", |
| 115 "//content/app/resources", |
| 115 "//crypto", | 116 "//crypto", |
| 116 "//net:resources", | 117 "//net:resources", |
| 117 "//third_party/wtl", | 118 "//third_party/wtl", |
| 118 "//ui/views", | 119 "//ui/views", |
| 119 "//webkit/glue/resources", | |
| 120 #'<(DEPTH)/chrome_elf/chrome_elf.gyp:chrome_elf' ] TODO(GYP) | 120 #'<(DEPTH)/chrome_elf/chrome_elf.gyp:chrome_elf' ] TODO(GYP) |
| 121 ] | 121 ] |
| 122 if (enable_configuration_policy) { | 122 if (enable_configuration_policy) { |
| 123 deps += [ "//components/policy" ] | 123 deps += [ "//components/policy" ] |
| 124 } | 124 } |
| 125 if (cpu_arch == "x86") { | 125 if (cpu_arch == "x86") { |
| 126 # Add a dependency to custom import library for user32 delay imports only | 126 # Add a dependency to custom import library for user32 delay imports only |
| 127 # in x86 builds. | 127 # in x86 builds. |
| 128 #deps += [ 'chrome_user32_delay_imports' ] TODO(GYP) | 128 #deps += [ 'chrome_user32_delay_imports' ] TODO(GYP) |
| 129 } | 129 } |
| (...skipping 144 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 274 | 274 |
| 275 # GYP version: chrome/chrome_resources.gyp:chrome_strings | 275 # GYP version: chrome/chrome_resources.gyp:chrome_strings |
| 276 group("strings") { | 276 group("strings") { |
| 277 deps = [ | 277 deps = [ |
| 278 "//chrome/app:chromium_strings", | 278 "//chrome/app:chromium_strings", |
| 279 "//chrome/app:generated_resources", | 279 "//chrome/app:generated_resources", |
| 280 "//chrome/app:google_chrome_strings", | 280 "//chrome/app:google_chrome_strings", |
| 281 "//chrome/app/resources:locale_settings", | 281 "//chrome/app/resources:locale_settings", |
| 282 ] | 282 ] |
| 283 } | 283 } |
| OLD | NEW |