Chromium Code Reviews| 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/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 43 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 54 ":chrome_initial", | 54 ":chrome_initial", |
| 55 ] | 55 ] |
| 56 } | 56 } |
| 57 } | 57 } |
| 58 | 58 |
| 59 if (!is_android && !is_mac) { | 59 if (!is_android && !is_mac) { |
| 60 group("chrome") { | 60 group("chrome") { |
| 61 public_deps = [ | 61 public_deps = [ |
| 62 ":chrome_initial", | 62 ":chrome_initial", |
| 63 ] | 63 ] |
| 64 data_deps = [ | |
| 65 ":chrome_initial", | |
| 66 ] | |
| 64 if (is_win) { | 67 if (is_win) { |
| 65 public_deps += [ ":reorder_imports" ] | 68 public_deps += [ ":reorder_imports" ] |
| 66 } | 69 } |
| 67 if (use_aura && (is_win || is_linux)) { | 70 if (use_aura && (is_win || is_linux)) { |
| 68 data_deps = [ | 71 data_deps = [ |
|
Dirk Pranke
2016/06/07 22:23:02
This needs to be += now.
Ken Russell (switch to Gerrit)
2016/06/07 23:54:08
Done.
| |
| 69 "//chrome/app:mojo_manifests", | 72 "//chrome/app:mojo_manifests", |
| 70 ] | 73 ] |
| 71 } | 74 } |
| 72 } | 75 } |
| 73 | 76 |
| 74 executable("chrome_initial") { | 77 executable("chrome_initial") { |
| 75 if (is_win) { | 78 if (is_win) { |
| 76 output_name = "initialexe/chrome" | 79 output_name = "initialexe/chrome" |
| 77 } else { | 80 } else { |
| 78 output_name = "chrome" | 81 output_name = "chrome" |
| (...skipping 341 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 420 } | 423 } |
| 421 } else if (is_mac) { | 424 } else if (is_mac) { |
| 422 chrome_helper_name = chrome_product_full_name + " Helper" | 425 chrome_helper_name = chrome_product_full_name + " Helper" |
| 423 chrome_framework_name = chrome_product_full_name + " Framework" | 426 chrome_framework_name = chrome_product_full_name + " Framework" |
| 424 | 427 |
| 425 group("chrome") { | 428 group("chrome") { |
| 426 deps = [ | 429 deps = [ |
| 427 ":chrome_app", | 430 ":chrome_app", |
| 428 ] | 431 ] |
| 429 | 432 |
| 433 data_deps = [ | |
| 434 ":chrome_app", | |
| 435 ] | |
| 436 | |
| 430 if (debug_devtools) { | 437 if (debug_devtools) { |
| 431 deps += [ ":devtools_debug_resources" ] | 438 deps += [ ":devtools_debug_resources" ] |
| 432 } | 439 } |
| 433 } | 440 } |
| 434 | 441 |
| 435 tweak_info_plist("chrome_app_plist") { | 442 tweak_info_plist("chrome_app_plist") { |
| 436 info_plist = "app/app-Info.plist" | 443 info_plist = "app/app-Info.plist" |
| 437 _keystone_arg = "0" | 444 _keystone_arg = "0" |
| 438 if (enable_mac_keystone) { | 445 if (enable_mac_keystone) { |
| 439 _keystone_arg = "1" | 446 _keystone_arg = "1" |
| (...skipping 1223 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1663 "//chrome/app/theme/$branding_path_component/product_logo_48.png", | 1670 "//chrome/app/theme/$branding_path_component/product_logo_48.png", |
| 1664 "//chrome/tools/build/linux/chrome-wrapper", | 1671 "//chrome/tools/build/linux/chrome-wrapper", |
| 1665 "//third_party/xdg-utils/scripts/xdg-mime", | 1672 "//third_party/xdg-utils/scripts/xdg-mime", |
| 1666 "//third_party/xdg-utils/scripts/xdg-settings", | 1673 "//third_party/xdg-utils/scripts/xdg-settings", |
| 1667 ] | 1674 ] |
| 1668 outputs = [ | 1675 outputs = [ |
| 1669 "$root_out_dir/{{source_file_part}}", | 1676 "$root_out_dir/{{source_file_part}}", |
| 1670 ] | 1677 ] |
| 1671 } | 1678 } |
| 1672 } | 1679 } |
| OLD | NEW |