diff options
| author | bajones@chromium.org <bajones@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-27 16:32:34 +0000 |
|---|---|---|
| committer | bajones@chromium.org <bajones@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-27 16:32:34 +0000 |
| commit | fd9796c5278987464d40619f6b59cc7d46465e9b (patch) | |
| tree | f3e40b3c1638ea073dfbd021cddec96708d9f5e6 /chrome/chrome_dll_bundle.gypi | |
| parent | 7bdda28d5d5fc516479993cf53fc20a1383f3980 (diff) | |
| download | chromium_src-fd9796c5278987464d40619f6b59cc7d46465e9b.zip chromium_src-fd9796c5278987464d40619f6b59cc7d46465e9b.tar.gz chromium_src-fd9796c5278987464d40619f6b59cc7d46465e9b.tar.bz2 | |
Revert 259788 "Fixup mojo dylibs"
Broke Mac GPU bots. content_gl_tests began failing with:
dyld: Library not loaded: @loader_path/libmojo_system.dylib
Referenced from: /tmp/run_tha_testiM3m5a/out/Release/content_gl_tests
Reason: image not found
> Fixup mojo dylibs
>
> BUG=
> R=mark@chromium.org
>
> Review URL: https://codereview.chromium.org/211503005
TBR=davemoore@chromium.org
Review URL: https://codereview.chromium.org/214833004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@259908 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/chrome_dll_bundle.gypi')
| -rw-r--r-- | chrome/chrome_dll_bundle.gypi | 31 |
1 files changed, 1 insertions, 30 deletions
diff --git a/chrome/chrome_dll_bundle.gypi b/chrome/chrome_dll_bundle.gypi index dad94c1..a4b6d6c 100644 --- a/chrome/chrome_dll_bundle.gypi +++ b/chrome/chrome_dll_bundle.gypi @@ -128,35 +128,6 @@ '--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', @@ -168,7 +139,7 @@ ], 'copies': [ { - # Copy FFmpeg binaries for audio/video support and mojo. + # Copy FFmpeg binaries for audio/video support. 'destination': '<(PRODUCT_DIR)/$(CONTENTS_FOLDER_PATH)/Libraries', 'files': [ '<(PRODUCT_DIR)/ffmpegsumo.so', |