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

Side by Side Diff: chrome/BUILD.gn

Issue 1818423003: Revert of Remove configuration policy from chrome build files. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@policy_chrome_defines
Patch Set: Created 4 years, 9 months 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/android/BUILD.gn » ('j') | no next file with comments »
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/buildflag_header.gni") 5 import("//build/buildflag_header.gni")
6 import("//build/config/chrome_build.gni") 6 import("//build/config/chrome_build.gni")
7 import("//build/config/compiler/compiler.gni") 7 import("//build/config/compiler/compiler.gni")
8 import("//build/config/features.gni") 8 import("//build/config/features.gni")
9 import("//build/config/locales.gni") 9 import("//build/config/locales.gni")
10 import("//build/config/sanitizers/sanitizers.gni") 10 import("//build/config/sanitizers/sanitizers.gni")
(...skipping 295 matching lines...) Expand 10 before | Expand all | Expand 10 after
306 if (is_win) { 306 if (is_win) {
307 output_name = "chrome" 307 output_name = "chrome"
308 308
309 deps += [ 309 deps += [
310 ":chrome_dll_manifest", 310 ":chrome_dll_manifest",
311 ":chrome_dll_version", 311 ":chrome_dll_version",
312 "//base/trace_event/etw_manifest:chrome_events_win", 312 "//base/trace_event/etw_manifest:chrome_events_win",
313 "//chrome/app/theme:chrome_unscaled_resources", 313 "//chrome/app/theme:chrome_unscaled_resources",
314 "//chrome_elf", 314 "//chrome_elf",
315 "//components/crash/content/app", 315 "//components/crash/content/app",
316 "//components/policy",
317 "//content/app/resources", 316 "//content/app/resources",
318 "//crypto", 317 "//crypto",
319 "//net:net_resources", 318 "//net:net_resources",
320 "//third_party/wtl", 319 "//third_party/wtl",
321 "//ui/views", 320 "//ui/views",
322 ] 321 ]
322 if (enable_configuration_policy) {
323 deps += [ "//components/policy" ]
324 }
323 if (current_cpu == "x86") { 325 if (current_cpu == "x86") {
324 # TODO(GYP) bug 512861: Lots of VCLinkerTool stuff on Windows. 326 # TODO(GYP) bug 512861: Lots of VCLinkerTool stuff on Windows.
325 #deps += [ 'chrome_user32_delay_imports' ] TODO(GYP) 327 #deps += [ 'chrome_user32_delay_imports' ] TODO(GYP)
326 } 328 }
327 329
328 if (!is_component_build) { 330 if (!is_component_build) {
329 # This is a large module that can't do incremental linking in some cases . 331 # This is a large module that can't do incremental linking in some cases .
330 configs -= [ "//build/config/win:default_incremental_linking" ] 332 configs -= [ "//build/config/win:default_incremental_linking" ]
331 configs += 333 configs +=
332 [ "//build/config/win:default_large_module_incremental_linking" ] 334 [ "//build/config/win:default_large_module_incremental_linking" ]
(...skipping 101 matching lines...) Expand 10 before | Expand all | Expand 10 after
434 if (chrome_pgo_phase == 1) { 436 if (chrome_pgo_phase == 1) {
435 ldflags = [ 437 ldflags = [
436 "/LTCG:PGINSTRUMENT", 438 "/LTCG:PGINSTRUMENT",
437 "/PogoSafeMode", 439 "/PogoSafeMode",
438 ] 440 ]
439 } else if (chrome_pgo_phase == 2) { 441 } else if (chrome_pgo_phase == 2) {
440 ldflags = [ "/LTCG:PGOPTIMIZE" ] 442 ldflags = [ "/LTCG:PGOPTIMIZE" ]
441 } 443 }
442 } 444 }
443 445
444 deps += [ "//chrome/browser/policy:path_parser" ] 446 if (enable_configuration_policy) {
447 deps += [ "//chrome/browser/policy:path_parser" ]
448 }
445 449
446 if (enable_plugins && enable_pdf) { 450 if (enable_plugins && enable_pdf) {
447 deps += [ "//pdf" ] 451 deps += [ "//pdf" ]
448 } 452 }
449 } 453 }
450 } 454 }
451 } 455 }
452 456
453 # GYP version: chromium_browser_dependencies variable in chrome.gyp 457 # GYP version: chromium_browser_dependencies variable in chrome.gyp
454 group("browser_dependencies") { 458 group("browser_dependencies") {
(...skipping 649 matching lines...) Expand 10 before | Expand all | Expand 10 after
1104 "//chrome/app/theme/$branding_path_component/product_logo_48.png", 1108 "//chrome/app/theme/$branding_path_component/product_logo_48.png",
1105 "//chrome/tools/build/linux/chrome-wrapper", 1109 "//chrome/tools/build/linux/chrome-wrapper",
1106 "//third_party/xdg-utils/scripts/xdg-mime", 1110 "//third_party/xdg-utils/scripts/xdg-mime",
1107 "//third_party/xdg-utils/scripts/xdg-settings", 1111 "//third_party/xdg-utils/scripts/xdg-settings",
1108 ] 1112 ]
1109 outputs = [ 1113 outputs = [
1110 "$root_out_dir/{{source_file_part}}", 1114 "$root_out_dir/{{source_file_part}}",
1111 ] 1115 ]
1112 } 1116 }
1113 } 1117 }
OLDNEW
« no previous file with comments | « no previous file | chrome/android/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698