diff options
| author | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-20 21:16:57 +0000 |
|---|---|---|
| committer | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-20 21:16:57 +0000 |
| commit | 2294ea498df17b1babe390e9c6e0c5554363eaac (patch) | |
| tree | 744c96e2110f9fdbc927ce702191898c9ca2250a /chrome/installer | |
| parent | 999f3e8cc3a4ffab740454faf18f026ec3f7c073 (diff) | |
| download | chromium_src-2294ea498df17b1babe390e9c6e0c5554363eaac.zip chromium_src-2294ea498df17b1babe390e9c6e0c5554363eaac.tar.gz chromium_src-2294ea498df17b1babe390e9c6e0c5554363eaac.tar.bz2 | |
Turns on use_mojo=1 for linux.
BUG=353602
TEST=none
R=csharp@chromium.org, mmoss@google.com, thestig@chromium.org, mmoss@chromium.org
Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=258062
Review URL: https://codereview.chromium.org/203963003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@258411 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/installer')
| -rw-r--r-- | chrome/installer/linux/common/installer.include | 7 | ||||
| -rw-r--r-- | chrome/installer/linux/rpm/expected_deps_i386 | 1 | ||||
| -rw-r--r-- | chrome/installer/linux/rpm/expected_deps_x86_64 | 1 |
3 files changed, 8 insertions, 1 deletions
diff --git a/chrome/installer/linux/common/installer.include b/chrome/installer/linux/common/installer.include index 9123a6e..616c3c4 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 + 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 diff --git a/chrome/installer/linux/rpm/expected_deps_i386 b/chrome/installer/linux/rpm/expected_deps_i386 index 52fd504..5683fe9 100644 --- a/chrome/installer/linux/rpm/expected_deps_i386 +++ b/chrome/installer/linux/rpm/expected_deps_i386 @@ -39,6 +39,7 @@ libgio-2.0.so.0 libglib-2.0.so.0 libgobject-2.0.so.0 libgtk-x11-2.0.so.0 +libmojo_system.so libm.so.6 libm.so.6(GLIBC_2.0) libm.so.6(GLIBC_2.1) diff --git a/chrome/installer/linux/rpm/expected_deps_x86_64 b/chrome/installer/linux/rpm/expected_deps_x86_64 index 1435e39..59ca7cb 100644 --- a/chrome/installer/linux/rpm/expected_deps_x86_64 +++ b/chrome/installer/linux/rpm/expected_deps_x86_64 @@ -33,6 +33,7 @@ libgio-2.0.so.0()(64bit) libglib-2.0.so.0()(64bit) libgobject-2.0.so.0()(64bit) libgtk-x11-2.0.so.0()(64bit) +libmojo_system.so()(64bit) libm.so.6()(64bit) libm.so.6(GLIBC_2.2.5)(64bit) libnspr4.so()(64bit) |