Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(773)

Side by Side Diff: chrome/BUILD.gn

Issue 1133853005: Fix path_parser dependency on policy component (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Change also corresponding GYP files Created 5 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | chrome/browser/policy/BUILD.gn » ('j') | chrome/browser/policy/BUILD.gn » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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/compiler/compiler.gni") 6 import("//build/config/compiler/compiler.gni")
7 import("//build/config/features.gni") 7 import("//build/config/features.gni")
8 import("//build/config/locales.gni") 8 import("//build/config/locales.gni")
9 import("//build/config/sanitizers/sanitizers.gni") 9 import("//build/config/sanitizers/sanitizers.gni")
10 import("//build/config/ui.gni") 10 import("//build/config/ui.gni")
(...skipping 405 matching lines...) Expand 10 before | Expand all | Expand 10 after
416 416
417 configs += [ "//build/config/compiler:wexit_time_destructors" ] 417 configs += [ "//build/config/compiler:wexit_time_destructors" ]
418 defines = [ "CHROME_MULTIPLE_DLL_CHILD" ] 418 defines = [ "CHROME_MULTIPLE_DLL_CHILD" ]
419 419
420 deps = [ 420 deps = [
421 ":child_dependencies", 421 ":child_dependencies",
422 ":chrome_child_manifest", 422 ":chrome_child_manifest",
423 ":chrome_dll_version", 423 ":chrome_dll_version",
424 "//base/allocator", 424 "//base/allocator",
425 "//build/config/sanitizers:deps", 425 "//build/config/sanitizers:deps",
426 "//chrome/browser/policy:path_parser",
427 "//components/browser_watcher:browser_watcher_client", 426 "//components/browser_watcher:browser_watcher_client",
428 "//components/crash/content/app", 427 "//components/crash/content/app",
429 "//content/public/app:child", 428 "//content/public/app:child",
430 ] 429 ]
431 430
432 if (is_win) { 431 if (is_win) {
433 if (symbol_level == 2) { 432 if (symbol_level == 2) {
434 # Incremental linking doesn't work on this target in debug mode with 433 # Incremental linking doesn't work on this target in debug mode with
435 # full symbols, but does work in other cases, including minimal 434 # full symbols, but does work in other cases, including minimal
436 # symbols. 435 # symbols.
437 configs -= [ "//build/config/win:default_incremental_linking" ] 436 configs -= [ "//build/config/win:default_incremental_linking" ]
438 configs += [ "//build/config/win:incremental_linking" ] 437 configs += [ "//build/config/win:incremental_linking" ]
439 } 438 }
440 # TODO(GYP) bug 512851: PGO on Windows. 439 # TODO(GYP) bug 512851: PGO on Windows.
441 # ['chrome_pgo_phase==1', { 440 # ['chrome_pgo_phase==1', {
442 # 'msvs_settings': { 441 # 'msvs_settings': {
443 # 'VCLinkerTool': { 442 # 'VCLinkerTool': {
444 # 'LinkTimeCodeGeneration': '2', 443 # 'LinkTimeCodeGeneration': '2',
445 # }, 444 # },
446 # }, 445 # },
447 # }], 446 # }],
448 # ['chrome_pgo_phase==2', { 447 # ['chrome_pgo_phase==2', {
449 # 'msvs_settings': { 448 # 'msvs_settings': {
450 # 'VCLinkerTool': { 449 # 'VCLinkerTool': {
451 # 'LinkTimeCodeGeneration': '3', 450 # 'LinkTimeCodeGeneration': '3',
452 # }, 451 # },
453 # }, 452 # },
454 # }], 453 # }],
455 } 454 }
455
456 if (enable_configuration_policy) {
457 deps += [ "//chrome/browser/policy:path_parser" ]
458 }
459
456 if (enable_plugins && enable_pdf) { 460 if (enable_plugins && enable_pdf) {
457 deps += [ "//pdf" ] 461 deps += [ "//pdf" ]
458 } 462 }
459 } 463 }
460 } 464 }
461 } 465 }
462 466
463 # GYP version: chromium_browser_dependencies variable in chrome.gyp 467 # GYP version: chromium_browser_dependencies variable in chrome.gyp
464 group("browser_dependencies") { 468 group("browser_dependencies") {
465 public_deps = [ 469 public_deps = [
(...skipping 610 matching lines...) Expand 10 before | Expand all | Expand 10 after
1076 "//chrome/app/theme/$branding_path_component/product_logo_48.png", 1080 "//chrome/app/theme/$branding_path_component/product_logo_48.png",
1077 "//chrome/tools/build/linux/chrome-wrapper", 1081 "//chrome/tools/build/linux/chrome-wrapper",
1078 "//third_party/xdg-utils/scripts/xdg-mime", 1082 "//third_party/xdg-utils/scripts/xdg-mime",
1079 "//third_party/xdg-utils/scripts/xdg-settings", 1083 "//third_party/xdg-utils/scripts/xdg-settings",
1080 ] 1084 ]
1081 outputs = [ 1085 outputs = [
1082 "$root_out_dir/{{source_file_part}}", 1086 "$root_out_dir/{{source_file_part}}",
1083 ] 1087 ]
1084 } 1088 }
1085 } 1089 }
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/policy/BUILD.gn » ('j') | chrome/browser/policy/BUILD.gn » ('J')

Powered by Google App Engine
This is Rietveld 408576698