diff options
| author | kerrnel <kerrnel@chromium.org> | 2015-11-05 11:48:47 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-11-05 19:49:43 +0000 |
| commit | ae428cc69d7a7fbc5b321851ba94b93369628a7a (patch) | |
| tree | 7c182dcdc69d71a4bb330c46eccbcdff14974ed0 /chrome/chrome.gyp | |
| parent | ac11c6df133ee4378038d1e644d91d1f37c11b85 (diff) | |
| download | chromium_src-ae428cc69d7a7fbc5b321851ba94b93369628a7a.zip chromium_src-ae428cc69d7a7fbc5b321851ba94b93369628a7a.tar.gz chromium_src-ae428cc69d7a7fbc5b321851ba94b93369628a7a.tar.bz2 | |
Switch Chrome to dlopen() the Google Chrome Framework.framework.
Switch Chrome to dlopen() the Google Chrome Framework.framework,
instead of relying on the linker. This is necessary to opt into the
restrict flag, because the restrict flag will not allow relative search
paths to be used for linking libraries.
BUG=523041
Review URL: https://codereview.chromium.org/1412803002
Cr-Commit-Position: refs/heads/master@{#358110}
Diffstat (limited to 'chrome/chrome.gyp')
| -rw-r--r-- | chrome/chrome.gyp | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp index 7400c3e..cfd46cc 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 |