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

Unified Diff: chrome/BUILD.gn

Issue 1413783003: Make chrome and other targets compile on Mac GN (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: ChromeOS fixes Created 5 years, 2 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
Index: chrome/BUILD.gn
diff --git a/chrome/BUILD.gn b/chrome/BUILD.gn
index 7079bbb92234c2179a116e2d1bfa301989e87c61..8816e81abbcb867fffad8d78c5c0cbed1bc8be27 100644
--- a/chrome/BUILD.gn
+++ b/chrome/BUILD.gn
@@ -276,6 +276,23 @@ if (is_mac || is_win) {
shared_library("main_dll") {
configs += [ "//build/config/compiler:wexit_time_destructors" ]
defines = []
+ ldflags = []
+
+ sources = [
+ "//base/win/dllmain.cc",
+ "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/chrome_main_mac.h",
+ "app/chrome_main_mac.mm",
+ "app/close_handle_hook_win.cc",
+ "app/close_handle_hook_win.h",
+ "app/delay_load_hook_win.cc",
+ "app/delay_load_hook_win.h",
+ ]
deps = [
":browser_dependencies",
@@ -285,20 +302,6 @@ if (is_mac || is_win) {
if (is_win) {
output_name = "chrome"
- sources = [
- "//base/win/dllmain.cc",
- "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",
- ]
-
deps += [
":chrome_dll_manifest",
":chrome_dll_version",
@@ -350,6 +353,21 @@ if (is_mac || is_win) {
# 'includes': [ 'chrome_dll_bundle.gypi' ],
#}],
# TODO(GYP) Lots of other stuff in the OS=="mac" block.
+ sources += [
+ "app/chrome_crash_reporter_client.cc",
+ "app/chrome_crash_reporter_client.h",
+ "app/chrome_crash_reporter_client_mac.mm",
+ ]
+ deps += [
+ "//components/crash/content/app",
+ "//components/policy",
+ ]
+
+ # Define the order of symbols within the framework.
+ ldflags += [
+ "-Wl,-order_file",
+ "-Wl," + rebase_path("app/framework.order", root_build_dir),
+ ]
}
if (enable_plugins && !is_multi_dll_chrome) {
« BUILD.gn ('K') | « build/toolchain/mac/BUILD.gn ('k') | chrome/chrome_tests.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698