chrome/chrome.gyp - Issue 1412803002: Switch Chrome to dlopen() the Google Chrome Framework.framework.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/chrome.gyp

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

Index: chrome/chrome.gyp

diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp

index c9986e18bf93c56f3f5024b58a5ae48f71c30f16..e574d13a8051580c91009533c1083fc8e9a10f46 100644

--- a/chrome/chrome.gyp

+++ b/chrome/chrome.gyp

@@ -154,19 +154,23 @@

'product_name': '<(mac_product_name) Helper',

'mac_bundle': 1,

'dependencies': [

- 'chrome_dll',

+ 'chrome_dll_dependency_shim',

'infoplist_strings_tool',

+ 'common_constants.gyp:version_header',

+ ],

+ 'defines': [

+ 'HELPER_EXECUTABLE'

'sources': [

- # chrome_exe_main_mac.cc's main() is the entry point for

+ # chrome_exe_main_mac.c's main() is the entry point for

# the "chrome" (browser app) target. All it does is jump

# to chrome_dll's ChromeMain. This is appropriate for

# helper processes too, because the logic to discriminate

# between process types at run time is actually directed

# by the --type command line argument processed by

- # ChromeMain. Sharing chrome_exe_main_mac.cc with the

+ # ChromeMain. Sharing chrome_exe_main_mac.c with the

# browser app will suffice for now.

- 'app/chrome_exe_main_mac.cc',

+ 'app/chrome_exe_main_mac.c',

'app/helper-Info.plist',

# TODO(mark): Come up with a fancier way to do this. It should only

« chrome/app/chrome_exe_main_mac.c ('K') | « chrome/app/chrome_exe_main_mac.cc ('k') | chrome/chrome_dll.gypi » ('j') | no next file with comments »