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

Unified Diff: chrome/chrome_exe.gypi

Issue 1412803002: Switch Chrome to dlopen() the Google Chrome Framework.framework. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Add a shim so that Chrome does not link chrome_dll 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
« chrome/app/chrome_exe_main_mac.c ('K') | « chrome/chrome_dll.gypi ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/chrome_exe.gypi
diff --git a/chrome/chrome_exe.gypi b/chrome/chrome_exe.gypi
index 89fbe4394afee14738e39c9d219e6d76e96cb82f..83ae4f1b69abdb305bfc00ac9caceb4ae3319697 100644
--- a/chrome/chrome_exe.gypi
+++ b/chrome/chrome_exe.gypi
@@ -46,6 +46,7 @@
# GN version: //chrome:chrome_initial
'target_name': 'chrome_initial',
'type': 'executable',
+ 'dependencies' : [ '../chrome/common_constants.gyp:version_header', ],
# Name the exe chrome.exe, not chrome_initial.exe.
'product_name': 'chrome',
'mac_bundle': 1,
@@ -60,7 +61,7 @@
'<(DEPTH)/content/public/common/content_switches.cc',
'app/chrome_exe_load_config_win.cc',
'app/chrome_exe_main_aura.cc',
- 'app/chrome_exe_main_mac.cc',
+ 'app/chrome_exe_main_mac.c',
'app/chrome_exe_main_win.cc',
'app/chrome_exe_resource.h',
'app/chrome_watcher_client_win.cc',
@@ -270,7 +271,7 @@
'infoplist_strings_tool',
# On Mac, make sure we've built chrome_dll, which contains all of
# the library code with Chromium functionality.
- 'chrome_dll',
+ 'chrome_dll_dependency_shim',
],
'mac_bundle_resources': [
'app/theme/<(branding_path_component)/mac/app.icns',
« chrome/app/chrome_exe_main_mac.c ('K') | « chrome/chrome_dll.gypi ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698