| 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 96 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 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 "//content/app/resources", |
| 116 "//crypto", | 116 "//crypto", |
| 117 "//net:resources", | 117 "//net:net_resources", |
| 118 "//third_party/wtl", | 118 "//third_party/wtl", |
| 119 "//ui/views", | 119 "//ui/views", |
| 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. |
| (...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 205 "//content/ppapi_plugin", | 205 "//content/ppapi_plugin", |
| 206 "//third_party/WebKit/public:blink_devtools_frontend_resources", | 206 "//third_party/WebKit/public:blink_devtools_frontend_resources", |
| 207 ] | 207 ] |
| 208 } | 208 } |
| 209 } | 209 } |
| 210 | 210 |
| 211 if (is_win) { | 211 if (is_win) { |
| 212 # TODO(brettw) this duplicates "//chrome/common:version" which applies to | 212 # TODO(brettw) this duplicates "//chrome/common:version" which applies to |
| 213 # Linux. | 213 # Linux. |
| 214 process_version("version_header") { | 214 process_version("version_header") { |
| 215 visibility = ":*" | 215 # TODO(brettW) this should have more reduced visibility, but chrome/browser |
| 216 # currently depends on this. |
| 217 #visibility = ":*" |
| 216 source = "version.h.in" | 218 source = "version.h.in" |
| 217 # TODO(brettw) this should move to $target_gen_dir/version.h and | 219 # TODO(brettw) this should move to $target_gen_dir/version.h and |
| 218 # source files including it should reference it via "chrome/version.h" | 220 # source files including it should reference it via "chrome/version.h" |
| 219 output = "$root_gen_dir/version.h" | 221 output = "$root_gen_dir/version.h" |
| 220 } | 222 } |
| 221 } | 223 } |
| 222 | 224 |
| 223 # GYP version: chrome/chrome_resources.gyp:chrome_resources | 225 # GYP version: chrome/chrome_resources.gyp:chrome_resources |
| 224 group("resources") { | 226 group("resources") { |
| 225 deps = [ | 227 deps = [ |
| (...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 274 | 276 |
| 275 # GYP version: chrome/chrome_resources.gyp:chrome_strings | 277 # GYP version: chrome/chrome_resources.gyp:chrome_strings |
| 276 group("strings") { | 278 group("strings") { |
| 277 deps = [ | 279 deps = [ |
| 278 "//chrome/app:chromium_strings", | 280 "//chrome/app:chromium_strings", |
| 279 "//chrome/app:generated_resources", | 281 "//chrome/app:generated_resources", |
| 280 "//chrome/app:google_chrome_strings", | 282 "//chrome/app:google_chrome_strings", |
| 281 "//chrome/app/resources:locale_settings", | 283 "//chrome/app/resources:locale_settings", |
| 282 ] | 284 ] |
| 283 } | 285 } |
| OLD | NEW |