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

Side by Side Diff: chrome/BUILD.gn

Issue 874033003: Fix chrome target in Windows GN build. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix building on chromeos. Created 5 years, 10 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 | « build/config/win/BUILD.gn ('k') | chrome/browser/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/config/features.gni") 5 import("//build/config/features.gni")
6 import("//build/config/locales.gni") 6 import("//build/config/locales.gni")
7 import("//build/config/ui.gni") 7 import("//build/config/ui.gni")
8 import("//chrome/chrome_repack_locales.gni") 8 import("//chrome/chrome_repack_locales.gni")
9 import("//chrome/version.gni") 9 import("//chrome/version.gni")
10 10
(...skipping 14 matching lines...) Expand all
25 deps = [] 25 deps = []
26 datadeps = [] 26 datadeps = []
27 27
28 # TODO(GYP) mac_bundle_resources, xcode_settings 28 # TODO(GYP) mac_bundle_resources, xcode_settings
29 29
30 # TODO(GYP) order_profiling, order_text_section 30 # TODO(GYP) order_profiling, order_text_section
31 31
32 if (is_win) { 32 if (is_win) {
33 sources += [ 33 sources += [
34 "$target_gen_dir/chrome_exe_version.rc", 34 "$target_gen_dir/chrome_exe_version.rc",
35 "app/chrome_crash_reporter_client.cc",
36 "app/chrome_crash_reporter_client.h",
37 "app/chrome_exe.rc",
35 "app/chrome_exe_main_win.cc", 38 "app/chrome_exe_main_win.cc",
36 "app/client_util.cc", 39 "app/client_util.cc",
37 "app/client_util.h", 40 "app/client_util.h",
41 "app/chrome_watcher_command_line_win.cc",
42 "app/chrome_watcher_command_line_win.h",
38 "app/signature_validator_win.cc", 43 "app/signature_validator_win.cc",
39 "app/signature_validator_win.h", 44 "app/signature_validator_win.h",
45 "common/crash_keys.cc",
46 "common/crash_keys.h'",
40 "//content/app/startup_helper_win.cc", 47 "//content/app/startup_helper_win.cc",
48 "//content/public/common/content_switches.cc",
41 ] 49 ]
42 deps += [ 50 deps += [
43 ":chrome_version_resources", 51 ":chrome_version_resources",
44 ":image_pre_reader", 52 ":image_pre_reader",
53 ":main_dll",
54
55 # 'chrome_nacl_win64" TODO(GYP)
56 # '../win8/delegate_execute/delegate_execute.gyp:*', TODO(GYP)
57 # '../win8/metro_driver/metro_driver.gyp:metro_driver', TODO(GYP)
58 "//base",
59 "//breakpad:breakpad_handler",
60 "//breakpad:breakpad_sender",
45 "//chrome/browser:chrome_process_finder", 61 "//chrome/browser:chrome_process_finder",
46 "//chrome/chrome_watcher", 62 "//chrome/chrome_watcher",
47 "//chrome/chrome_watcher:client", 63 "//chrome/chrome_watcher:client",
64 "//chrome/installer/util",
65 "//chrome_elf",
48 "//components/browser_watcher:browser_watcher_client", 66 "//components/browser_watcher:browser_watcher_client",
67 "//components/crash/app",
68 "//crypto",
69 "//sandbox",
49 "//ui/gfx", 70 "//ui/gfx",
50 ] 71 ]
72 libs = [
73 "wintrust.lib",
74 "crypt32.lib",
75 ]
76 configs -= [ "//build/config/win:console" ]
77 configs += [ "//build/config/win:windowed" ]
51 } else if (use_aura) { 78 } else if (use_aura) {
52 # Non-Windows aura entrypoint. 79 # Non-Windows aura entrypoint.
53 sources += [ "app/chrome_exe_main_aura.cc" ] 80 sources += [ "app/chrome_exe_main_aura.cc" ]
54 } 81 }
55 82
56 if (is_linux) { 83 if (is_linux) {
57 # TODO(GYP) manpage action 84 # TODO(GYP) manpage action
58 85
59 sources += [ 86 sources += [
60 "app/chrome_dll_resource.h", 87 "app/chrome_dll_resource.h",
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
92 } 119 }
93 } 120 }
94 121
95 if (is_mac) { 122 if (is_mac) {
96 sources += [ "app/chrome_exe_main_mac.cc" ] 123 sources += [ "app/chrome_exe_main_mac.cc" ]
97 # TODO(GYP) lots more stuff in the is_mac block. 124 # TODO(GYP) lots more stuff in the is_mac block.
98 } else { # Non-Mac. 125 } else { # Non-Mac.
99 deps += [ 126 deps += [
100 ":packed_extra_resources", 127 ":packed_extra_resources",
101 ":packed_resources", 128 ":packed_resources",
129 "//components/startup_metric_utils",
102 130
103 # Copy Flash Player files to PRODUCT_DIR if applicable. Let the .gyp 131 # Copy Flash Player files to PRODUCT_DIR if applicable. Let the .gyp
104 # file decide what to do on a per-OS basis; on Mac, internal plugins 132 # file decide what to do on a per-OS basis; on Mac, internal plugins
105 # go inside the framework, so this dependency is in chrome_dll.gypi. 133 # go inside the framework, so this dependency is in chrome_dll.gypi.
106 #'../third_party/adobe/flash/flash_player.gyp:flapper_binaries', TODO(G YP) 134 #'../third_party/adobe/flash/flash_player.gyp:flapper_binaries', TODO(G YP)
107 135
108 # Copy CDM files to PRODUCT_DIR if applicable. Let the .gyp 136 # Copy CDM files to PRODUCT_DIR if applicable. Let the .gyp
109 # file decide what to do on a per-OS basis; on Mac, internal plugins 137 # file decide what to do on a per-OS basis; on Mac, internal plugins
110 # go inside the framework, so this dependency is in chrome_dll.gypi. 138 # go inside the framework, so this dependency is in chrome_dll.gypi.
111 #'../third_party/widevine/cdm/widevine_cdm.gyp:widevinecdmadapter', TOD O(GYP) 139 #'../third_party/widevine/cdm/widevine_cdm.gyp:widevinecdmadapter', TOD O(GYP)
(...skipping 535 matching lines...) Expand 10 before | Expand all | Expand 10 after
647 "//chrome/browser", 675 "//chrome/browser",
648 "//chrome/browser/ui", 676 "//chrome/browser/ui",
649 "//chrome/plugin", 677 "//chrome/plugin",
650 "//chrome/renderer", 678 "//chrome/renderer",
651 "//chrome/utility", 679 "//chrome/utility",
652 "//components/enhanced_bookmarks", 680 "//components/enhanced_bookmarks",
653 "//content/public/app:browser", 681 "//content/public/app:browser",
654 ] 682 ]
655 } 683 }
656 } 684 }
OLDNEW
« no previous file with comments | « build/config/win/BUILD.gn ('k') | chrome/browser/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698