| 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/chrome_build.gni") | 5 import("//build/config/chrome_build.gni") |
| 6 import("//build/config/features.gni") | 6 import("//build/config/features.gni") |
| 7 import("//build/config/locales.gni") | 7 import("//build/config/locales.gni") |
| 8 import("//build/config/sanitizers/sanitizers.gni") | 8 import("//build/config/sanitizers/sanitizers.gni") |
| 9 import("//build/config/ui.gni") | 9 import("//build/config/ui.gni") |
| 10 import("//build/config/win/manifest.gni") | 10 import("//build/config/win/manifest.gni") |
| (...skipping 202 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 213 deps += [ ":chrome_dll" ] | 213 deps += [ ":chrome_dll" ] |
| 214 | 214 |
| 215 # TODO(GYP) lots more stuff in the is_mac block. | 215 # TODO(GYP) lots more stuff in the is_mac block. |
| 216 } else { # Non-Mac. | 216 } else { # Non-Mac. |
| 217 # These files are used by the installer so we need a public dep. | 217 # These files are used by the installer so we need a public dep. |
| 218 public_deps += [ | 218 public_deps += [ |
| 219 ":packed_extra_resources", | 219 ":packed_extra_resources", |
| 220 ":packed_resources", | 220 ":packed_resources", |
| 221 ] | 221 ] |
| 222 deps += [ | 222 deps += [ |
| 223 "//components/startup_metric_utils", | 223 "//components/startup_metric_utils/browser", |
| 224 | 224 |
| 225 # Precompiled plugins that need to get copied to the output directory. | 225 # Precompiled plugins that need to get copied to the output directory. |
| 226 # On Mac, internal plugins go inside the framework, so these | 226 # On Mac, internal plugins go inside the framework, so these |
| 227 # dependencies are on chrome.dll. | 227 # dependencies are on chrome.dll. |
| 228 "//third_party/adobe/flash:flapper_binaries", | 228 "//third_party/adobe/flash:flapper_binaries", |
| 229 "//third_party/widevine/cdm:widevinecdmadapter", | 229 "//third_party/widevine/cdm:widevinecdmadapter", |
| 230 ] | 230 ] |
| 231 } | 231 } |
| 232 | 232 |
| 233 if (is_multi_dll_chrome) { | 233 if (is_multi_dll_chrome) { |
| (...skipping 162 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 396 configs += [ "//build/config/compiler:wexit_time_destructors" ] | 396 configs += [ "//build/config/compiler:wexit_time_destructors" ] |
| 397 defines = [ "CHROME_MULTIPLE_DLL_CHILD" ] | 397 defines = [ "CHROME_MULTIPLE_DLL_CHILD" ] |
| 398 | 398 |
| 399 deps = [ | 399 deps = [ |
| 400 ":child_dependencies", | 400 ":child_dependencies", |
| 401 ":chrome_child_manifest", | 401 ":chrome_child_manifest", |
| 402 ":chrome_dll_version", | 402 ":chrome_dll_version", |
| 403 "//base/allocator", | 403 "//base/allocator", |
| 404 "//build/config/sanitizers:deps", | 404 "//build/config/sanitizers:deps", |
| 405 "//chrome/browser/policy:path_parser", | 405 "//chrome/browser/policy:path_parser", |
| 406 |
| 407 # Required by chrome_main_delegate.cc |
| 408 "//components/startup_metric_utils/browser", |
| 406 "//content/public/app:child", | 409 "//content/public/app:child", |
| 407 ] | 410 ] |
| 408 | 411 |
| 409 if (is_win) { | 412 if (is_win) { |
| 410 # TODO(GYP) bug 512851: PGO on Windows. | 413 # TODO(GYP) bug 512851: PGO on Windows. |
| 411 # ['chrome_pgo_phase==1', { | 414 # ['chrome_pgo_phase==1', { |
| 412 # 'msvs_settings': { | 415 # 'msvs_settings': { |
| 413 # 'VCLinkerTool': { | 416 # 'VCLinkerTool': { |
| 414 # 'LinkTimeCodeGeneration': '2', | 417 # 'LinkTimeCodeGeneration': '2', |
| 415 # }, | 418 # }, |
| (...skipping 636 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1052 "//chrome/app/theme/$branding_path_component/product_logo_48.png", | 1055 "//chrome/app/theme/$branding_path_component/product_logo_48.png", |
| 1053 "//chrome/tools/build/linux/chrome-wrapper", | 1056 "//chrome/tools/build/linux/chrome-wrapper", |
| 1054 "//third_party/xdg-utils/scripts/xdg-mime", | 1057 "//third_party/xdg-utils/scripts/xdg-mime", |
| 1055 "//third_party/xdg-utils/scripts/xdg-settings", | 1058 "//third_party/xdg-utils/scripts/xdg-settings", |
| 1056 ] | 1059 ] |
| 1057 outputs = [ | 1060 outputs = [ |
| 1058 "$root_out_dir/{{source_file_part}}", | 1061 "$root_out_dir/{{source_file_part}}", |
| 1059 ] | 1062 ] |
| 1060 } | 1063 } |
| 1061 } | 1064 } |
| OLD | NEW |