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

Side by Side Diff: chrome/BUILD.gn

Issue 2037773005: Fix chrome_telemetry_build's GN dependencies for Mac OS X. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 6 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
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 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
49 "-a", 49 "-a",
50 target_cpu, 50 target_cpu,
51 ] 51 ]
52 deps = [ 52 deps = [
53 ":chrome_initial", 53 ":chrome_initial",
54 ] 54 ]
55 } 55 }
56 } 56 }
57 57
58 if (!is_android && !is_mac) { 58 if (!is_android && !is_mac) {
59 group("chrome") { 59 group("chrome") {
Dirk Pranke 2016/06/04 22:57:27 looks like you need to add a data_deps var here as
60 public_deps = [ 60 public_deps = [
61 ":chrome_initial", 61 ":chrome_initial",
62 ] 62 ]
63 if (is_win) { 63 if (is_win) {
64 public_deps += [ ":reorder_imports" ] 64 public_deps += [ ":reorder_imports" ]
65 } 65 }
66 if (use_aura && (is_win || is_linux)) { 66 if (use_aura && (is_win || is_linux)) {
67 data_deps = [ 67 data_deps = [
68 "//chrome/app:mojo_manifests", 68 "//chrome/app:mojo_manifests",
69 ] 69 ]
(...skipping 348 matching lines...) Expand 10 before | Expand all | Expand 10 after
418 } 418 }
419 } 419 }
420 } else if (is_mac) { 420 } else if (is_mac) {
421 chrome_helper_name = chrome_product_full_name + " Helper" 421 chrome_helper_name = chrome_product_full_name + " Helper"
422 chrome_framework_name = chrome_product_full_name + " Framework" 422 chrome_framework_name = chrome_product_full_name + " Framework"
423 423
424 group("chrome") { 424 group("chrome") {
425 deps = [ 425 deps = [
426 ":chrome_app", 426 ":chrome_app",
427 ] 427 ]
428 data_deps = [
429 ":chrome_app",
430 ]
428 } 431 }
429 432
430 tweak_info_plist("chrome_app_plist") { 433 tweak_info_plist("chrome_app_plist") {
431 info_plist = "app/app-Info.plist" 434 info_plist = "app/app-Info.plist"
432 _keystone_arg = "0" 435 _keystone_arg = "0"
433 if (enable_mac_keystone) { 436 if (enable_mac_keystone) {
434 _keystone_arg = "1" 437 _keystone_arg = "1"
435 } 438 }
436 args = [ 439 args = [
437 "--breakpad=0", 440 "--breakpad=0",
(...skipping 1169 matching lines...) Expand 10 before | Expand all | Expand 10 after
1607 "//chrome/app/theme/$branding_path_component/product_logo_48.png", 1610 "//chrome/app/theme/$branding_path_component/product_logo_48.png",
1608 "//chrome/tools/build/linux/chrome-wrapper", 1611 "//chrome/tools/build/linux/chrome-wrapper",
1609 "//third_party/xdg-utils/scripts/xdg-mime", 1612 "//third_party/xdg-utils/scripts/xdg-mime",
1610 "//third_party/xdg-utils/scripts/xdg-settings", 1613 "//third_party/xdg-utils/scripts/xdg-settings",
1611 ] 1614 ]
1612 outputs = [ 1615 outputs = [
1613 "$root_out_dir/{{source_file_part}}", 1616 "$root_out_dir/{{source_file_part}}",
1614 ] 1617 ]
1615 } 1618 }
1616 } 1619 }
OLDNEW
« no previous file with comments | « no previous file | tools/perf/chrome_telemetry_build/BUILD.gn » ('j') | tools/perf/chrome_telemetry_build/BUILD.gn » ('J')

Powered by Google App Engine
This is Rietveld 408576698