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

Unified Diff: chrome/chrome_dll_bundle.gypi

Issue 211503005: Fixup mojo dylibs to support mojo in content (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Only add mac to supported mojo platforms 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
Index: chrome/chrome_dll_bundle.gypi
diff --git a/chrome/chrome_dll_bundle.gypi b/chrome/chrome_dll_bundle.gypi
index a4b6d6cffc2f5559238b550761b2eb3fcc6ba7fb..d66225fbd890c47bdb568bd391388eee7beef3bb 100644
--- a/chrome/chrome_dll_bundle.gypi
+++ b/chrome/chrome_dll_bundle.gypi
@@ -128,6 +128,25 @@
'--branding=<(branding)'],
},
{
+ # 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}'],
+ },
+ {
+ # 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'],
+ },
+ {
'postbuild_name': 'Symlink Libraries',
'action': [
'ln',
@@ -139,10 +158,11 @@
],
'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',
+ '<(PRODUCT_DIR)/libmojo_system.dylib',
],
},
{
« no previous file with comments | « build/common.gypi ('k') | content/content_shell.gypi » ('j') | mojo/mojo_public.gypi » ('J')

Powered by Google App Engine
This is Rietveld 408576698