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_dll.gypi | |
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_dll.gypi')
-rw-r--r-- | chrome/chrome_dll.gypi | 29 |
1 files changed, 29 insertions, 0 deletions
diff --git a/chrome/chrome_dll.gypi b/chrome/chrome_dll.gypi index b0422e4..b2a2081 100644 --- a/chrome/chrome_dll.gypi +++ b/chrome/chrome_dll.gypi @@ -3,6 +3,35 @@ # found in the LICENSE file. { 'conditions': [ + # Dummy target to allow chrome to require chrome_dll to build + # without actually linking to the library + ['OS=="mac"', { + 'targets': [ + { + 'target_name': 'chrome_dll_dependency_shim', + 'type': 'executable', + 'dependencies': [ + 'chrome_dll', + ], + # In release, we end up with a strip step that is unhappy if there is + # no binary. Rather than check in a new file for this hack, just + # generate a source file on the fly. + 'actions': [ + { + 'action_name': 'generate_stub_main', + 'process_outputs_as_sources': 1, + 'inputs': [], + 'outputs': [ '<(INTERMEDIATE_DIR)/dummy_main.c' ], + 'action': [ + 'bash', '-c', + 'echo "int main() { return 0; }" > <(INTERMEDIATE_DIR)/dummy_main.c' + ], + }, + ], + }, + ], + }, + ], ['OS=="mac" or OS=="win"', { 'targets': [ { |