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

Unified Diff: chrome/BUILD.gn

Issue 890203002: Disable linking chrome.dll on GN Windows. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 11 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/BUILD.gn
diff --git a/chrome/BUILD.gn b/chrome/BUILD.gn
index 9341384167efc76b35893ac38a98c774eef3ea10..65106a2086ee8496bb8daf66e9ba1631eba7f2c5 100644
--- a/chrome/BUILD.gn
+++ b/chrome/BUILD.gn
@@ -17,6 +17,8 @@ if (is_win && !link_chrome_on_windows) {
# make targets work that depend on Chrome.
group("chrome") {
}
+ group("main_dll") {
+ }
}
if (!is_android && (!is_win || link_chrome_on_windows)) {
@@ -156,83 +158,85 @@ if (!is_android && (!is_win || link_chrome_on_windows)) {
}
} # !is_android
-shared_library("main_dll") {
- configs += [ "//build/config/compiler:wexit_time_destructors" ]
-
- deps = [
- ":browser_dependencies",
- "//base/allocator",
- ]
- if (is_win) {
- output_name = "chrome"
+if (!is_win || link_chrome_on_windows) {
+ shared_library("main_dll") {
+ configs += [ "//build/config/compiler:wexit_time_destructors" ]
- sources = [
- "app/chrome_command_ids.h",
- "app/chrome_dll.rc",
- "app/chrome_dll_resource.h",
- "app/chrome_main.cc",
- "app/chrome_main_delegate.cc",
- "app/chrome_main_delegate.h",
- "app/close_handle_hook_win.cc",
- "app/close_handle_hook_win.h",
- "app/delay_load_hook_win.cc",
- "app/delay_load_hook_win.h",
- "//base/win/dllmain.cc",
+ deps = [
+ ":browser_dependencies",
+ "//base/allocator",
]
+ if (is_win) {
+ output_name = "chrome"
- deps += [
- # On Windows, link the dependencies (libraries) that make up actual
- # Chromium functionality into this .dll.
- ":chrome_version_resources",
- "//chrome/app/theme:chrome_unscaled_resources",
- "//chrome_elf",
- "//content/app/resources",
- "//crypto",
- "//net:net_resources",
- "//third_party/wtl",
- "//ui/views",
- ]
- if (enable_configuration_policy) {
- deps += [ "//components/policy" ]
- }
- if (cpu_arch == "x86") {
- # Add a dependency to custom import library for user32 delay imports only
- # in x86 builds.
- #deps += [ 'chrome_user32_delay_imports' ] TODO(GYP)
- }
+ sources = [
+ "app/chrome_command_ids.h",
+ "app/chrome_dll.rc",
+ "app/chrome_dll_resource.h",
+ "app/chrome_main.cc",
+ "app/chrome_main_delegate.cc",
+ "app/chrome_main_delegate.h",
+ "app/close_handle_hook_win.cc",
+ "app/close_handle_hook_win.h",
+ "app/delay_load_hook_win.cc",
+ "app/delay_load_hook_win.h",
+ "//base/win/dllmain.cc",
+ ]
- # TODO(GYP) incremental linking flags in debug builds
- #'LinkIncremental': '<(msvs_large_module_debug_link_mode)',
+ deps += [
+ # On Windows, link the dependencies (libraries) that make up actual
+ # Chromium functionality into this .dll.
+ ":chrome_version_resources",
+ "//chrome/app/theme:chrome_unscaled_resources",
+ "//chrome_elf",
+ "//content/app/resources",
+ "//crypto",
+ "//net:net_resources",
+ "//third_party/wtl",
+ "//ui/views",
+ ]
+ if (enable_configuration_policy) {
+ deps += [ "//components/policy" ]
+ }
+ if (cpu_arch == "x86") {
+ # Add a dependency to custom import library for user32 delay imports only
+ # in x86 builds.
+ #deps += [ 'chrome_user32_delay_imports' ] TODO(GYP)
+ }
- # TODO(GYP) Lots of VCLinkerTool stuff on Windows.
+ # TODO(GYP) incremental linking flags in debug builds
+ #'LinkIncremental': '<(msvs_large_module_debug_link_mode)',
- # TODO(GYP) chrome_pgo_phase on Windows.
- }
+ # TODO(GYP) Lots of VCLinkerTool stuff on Windows.
- if (use_aura) {
- deps += [ "//ui/compositor" ]
- }
+ # TODO(GYP) chrome_pgo_phase on Windows.
+ }
- #TODO(GYP) add chrome_multiple_dll support
- if (false) { #chrome_multiple_dll) {
- defines = [ "CHROME_MULTIPLE_DLL_BROWSER" ]
- deps += [ "//content/public/app:browser" ]
- } else {
- deps += [
- ":child_dependencies",
- "//content/public/app:both",
- ]
- }
+ if (use_aura) {
+ deps += [ "//ui/compositor" ]
+ }
- if (cld_version == 0 || cld_version == 2) {
- deps += [ "//third_party/cld_2" ]
- }
+ #TODO(GYP) add chrome_multiple_dll support
+ if (false) { #chrome_multiple_dll) {
+ defines = [ "CHROME_MULTIPLE_DLL_BROWSER" ]
+ deps += [ "//content/public/app:browser" ]
+ } else {
+ deps += [
+ ":child_dependencies",
+ "//content/public/app:both",
+ ]
+ }
- if (is_mac) {
- #['OS=="mac" and component!="shared_library"', { TODO(GYP)
- # 'includes': [ 'chrome_dll_bundle.gypi' ],
- #}],
- # TODO(GYP) Lots of other stuff in the OS=="mac" block.
+ if (cld_version == 0 || cld_version == 2) {
+ deps += [ "//third_party/cld_2" ]
+ }
+
+ if (is_mac) {
+ #['OS=="mac" and component!="shared_library"', { TODO(GYP)
+ # 'includes': [ 'chrome_dll_bundle.gypi' ],
+ #}],
+ # TODO(GYP) Lots of other stuff in the OS=="mac" block.
+ }
}
}
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698