diff options
| author | davemoore@chromium.org <davemoore@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-27 05:24:24 +0000 |
|---|---|---|
| committer | davemoore@chromium.org <davemoore@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-27 05:24:24 +0000 |
| commit | fa17327c4636f5a3caffb98e26d3bbeca040084a (patch) | |
| tree | 4592f3733f376000751b272015583e17d676f07a /chrome | |
| parent | 23fec696d5b76c1fd520e85effc632a14bde3b34 (diff) | |
| download | chromium_src-fa17327c4636f5a3caffb98e26d3bbeca040084a.zip chromium_src-fa17327c4636f5a3caffb98e26d3bbeca040084a.tar.gz chromium_src-fa17327c4636f5a3caffb98e26d3bbeca040084a.tar.bz2 | |
Fixup mojo dylibs
BUG=
R=mark@chromium.org
Review URL: https://codereview.chromium.org/211503005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@259788 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/chrome_dll_bundle.gypi | 31 | ||||
| -rwxr-xr-x | chrome/tools/build/mac/dump_product_syms | 1 |
2 files changed, 31 insertions, 1 deletions
diff --git a/chrome/chrome_dll_bundle.gypi b/chrome/chrome_dll_bundle.gypi index a4b6d6c..dad94c1 100644 --- a/chrome/chrome_dll_bundle.gypi +++ b/chrome/chrome_dll_bundle.gypi @@ -128,6 +128,35 @@ '--branding=<(branding)'], }, { + # Copy libmojo_system.dylib explicitly. The copies section does a + # hard link, and since we modify it we would end up with the wrong + # load command in things linked afterward. + 'postbuild_name': 'Copy libmojo_system.dylib', + 'action': ['cp', + '-p', + '${BUILT_PRODUCTS_DIR}/libmojo_system.dylib', + '${BUILT_PRODUCTS_DIR}/${CONTENTS_FOLDER_PATH}/Libraries'], + }, + { + # Changes the id of libmojo_system.dylib to come from the Libraries folder + # to be consistent with the load command. + 'postbuild_name': 'Update id of libmojo_system.dylib', + 'action': ['install_name_tool', + '-id', + '@loader_path/Libraries/libmojo_system.dylib', + '${BUILT_PRODUCTS_DIR}/${CONTENTS_FOLDER_PATH}/Libraries/libmojo_system.dylib'], + }, + { + # Changes the load command of libmojo_system.dylib to come from + # the Libraries folder. + 'postbuild_name': 'Update load of libmojo_system.dylib', + 'action': ['install_name_tool', + '-change', + '@loader_path/libmojo_system.dylib', + '@loader_path/Libraries/libmojo_system.dylib', + '${BUILT_PRODUCTS_DIR}/${EXECUTABLE_PATH}'], + }, + { 'postbuild_name': 'Symlink Libraries', 'action': [ 'ln', @@ -139,7 +168,7 @@ ], 'copies': [ { - # Copy FFmpeg binaries for audio/video support. + # Copy FFmpeg binaries for audio/video support and mojo. 'destination': '<(PRODUCT_DIR)/$(CONTENTS_FOLDER_PATH)/Libraries', 'files': [ '<(PRODUCT_DIR)/ffmpegsumo.so', diff --git a/chrome/tools/build/mac/dump_product_syms b/chrome/tools/build/mac/dump_product_syms index ad816f5..0d3eb3b 100755 --- a/chrome/tools/build/mac/dump_product_syms +++ b/chrome/tools/build/mac/dump_product_syms @@ -82,6 +82,7 @@ SRC_NAMES=( "crash_inspector" "crash_report_sender.app" "ffmpegsumo.so" + "libmojo_system.dylib" "libplugin_carbon_interpose.dylib" "ppGoogleNaClPluginChrome.plugin" "remoting_host_plugin.plugin" |