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

Unified Diff: chrome/installer/linux/common/installer.include

Issue 203963003: Turns on use_mojo=1 for linux. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: chromeos==0 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/installer/linux/common/installer.include
diff --git a/chrome/installer/linux/common/installer.include b/chrome/installer/linux/common/installer.include
index 9123a6e0c3579e402d3f6763291d9853d5a14b40..616c3c4fc4f00196bb5a49dbe6d2be815900d6fa 100644
--- a/chrome/installer/linux/common/installer.include
+++ b/chrome/installer/linux/common/installer.include
@@ -150,6 +150,12 @@ stage_install_common() {
# ffmpeg libs
install -m 644 -s "${BUILDDIR}/libffmpegsumo.so" "${STAGEDIR}/${INSTALLDIR}/"
+ install -m 755 -d "${STAGEDIR}/${INSTALLDIR}/lib/"
+
+ if [ -f "${BUILDDIR}/lib/libmojo_system.so" ]; then
mmoss 2014/03/20 02:24:09 Does this need to be conditional? The common.gypi
sky 2014/03/20 14:51:40 I was hoping to make it so less changes are needed
+ install -m 644 -s "${BUILDDIR}/lib/libmojo_system.so" "${STAGEDIR}/${INSTALLDIR}/lib/"
+ fi
+
# Widevine CDM.
if [ -f "${BUILDDIR}/libwidevinecdmadapter.so" ]; then
install -m 644 -s "${BUILDDIR}/libwidevinecdmadapter.so" "${STAGEDIR}/${INSTALLDIR}/"
@@ -172,7 +178,6 @@ stage_install_common() {
# peerconnection shared library
if [ -f "${BUILDDIR}/lib/libpeerconnection.so" ]; then
- install -m 755 -d "${STAGEDIR}/${INSTALLDIR}/lib/"
install -m 644 -s "${BUILDDIR}/lib/libpeerconnection.so" "${STAGEDIR}/${INSTALLDIR}/lib/"
fi

Powered by Google App Engine
This is Rietveld 408576698