diff options
| author | davemoore@chromium.org <davemoore@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-28 17:19:30 +0000 |
|---|---|---|
| committer | davemoore@chromium.org <davemoore@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-28 17:19:30 +0000 |
| commit | f77f0cab3653f739dec2aba761f382fae291d5a9 (patch) | |
| tree | 24985eb1b87c78aea5e440cb875834b8f79a0e1c /content/content_shell.gypi | |
| parent | 452d6fdd21693fefdadba2ad99684285050a190b (diff) | |
| download | chromium_src-f77f0cab3653f739dec2aba761f382fae291d5a9.zip chromium_src-f77f0cab3653f739dec2aba761f382fae291d5a9.tar.gz chromium_src-f77f0cab3653f739dec2aba761f382fae291d5a9.tar.bz2 | |
Revert 260175 "Fixup mojo dylibs to support mojo in content"
sky is about to check something in that will interact poorly with this
and it'll be easier to apply the necessary changes after that.
> Fixup mojo dylibs to support mojo in content
>
> Second try after revert of
> https://codereview.chromium.org/211503005/
>
> The isolates failed because libmojo_system.dylib wasn't getting copied.
>
> BUG=
> TBR=mark@chromium.org
>
> Review URL: https://codereview.chromium.org/217003003
TBR=davemoore@chromium.org
Review URL: https://codereview.chromium.org/216793008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@260181 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/content_shell.gypi')
| -rw-r--r-- | content/content_shell.gypi | 31 |
1 files changed, 1 insertions, 30 deletions
diff --git a/content/content_shell.gypi b/content/content_shell.gypi index 4c579ad..d19cdc5 100644 --- a/content/content_shell.gypi +++ b/content/content_shell.gypi @@ -849,39 +849,10 @@ '--version=<(content_shell_version)', '--branding=<(content_shell_product_name)'], }, - { - # 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}'], - }, ], 'copies': [ { - # Copy FFmpeg 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', |