Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(35)

Unified Diff: trunk/src/content/content_shell.gypi

Issue 214833004: Revert 259788 "Fixup mojo dylibs" (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 6 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « trunk/src/chrome/tools/build/mac/dump_product_syms ('k') | trunk/src/mojo/mojo_public.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: trunk/src/content/content_shell.gypi
===================================================================
--- trunk/src/content/content_shell.gypi (revision 259907)
+++ trunk/src/content/content_shell.gypi (working copy)
@@ -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',
« no previous file with comments | « trunk/src/chrome/tools/build/mac/dump_product_syms ('k') | trunk/src/mojo/mojo_public.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698