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

Side by Side Diff: chrome/BUILD.gn

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