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
qweri0p · Mar 20, 2014 · 2294ea4 · 2294ea4
1 parent 999f3e8
commit 2294ea4
Show file tree

Hide file tree

Showing 12 changed files with 26 additions and 2 deletions.
diff --git a/build/common.gypi b/build/common.gypi
@@ -838,7 +838,7 @@
           'enable_printing%': 0,
         }],
 
-        ['OS=="win"', {
+        ['OS=="win" or (OS=="linux" and chromeos==0)', {
           'use_mojo%': 1,
         }],
 

diff --git a/chrome/chrome.isolate b/chrome/chrome.isolate
@@ -9,6 +9,7 @@
           '<(PRODUCT_DIR)/libffmpegsumo.so',
           '<(PRODUCT_DIR)/libosmesa.so',
           '<(PRODUCT_DIR)/libppGoogleNaClPluginChrome.so',
+          '<(PRODUCT_DIR)/lib/libmojo_system.so',
           '<(PRODUCT_DIR)/nacl_helper<(EXECUTABLE_SUFFIX)',
           '<(PRODUCT_DIR)/nacl_helper_bootstrap<(EXECUTABLE_SUFFIX)',
         ],

diff --git a/chrome/chrome_installer.gypi b/chrome/chrome_installer.gypi
@@ -545,6 +545,11 @@
               '<(PRODUCT_DIR)/lib/libpeerconnection.so',
             ],
           }],
+          ['use_mojo==1', {
+            'packaging_files_binaries': [
+              '<(PRODUCT_DIR)/lib/libmojo_system.so',
+            ],
+          }],
         ],
       },
       'targets': [

diff --git 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
@@ -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
@@ -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)

diff --git a/chrome/interactive_ui_tests.isolate b/chrome/interactive_ui_tests.isolate
@@ -15,6 +15,7 @@
           '../testing/xvfb.py',
           '<(PRODUCT_DIR)/libffmpegsumo.so',
           '<(PRODUCT_DIR)/libosmesa.so',
+          '<(PRODUCT_DIR)/lib/libmojo_system.so',
           '<(PRODUCT_DIR)/pyproto/google/__init__.py',
           '<(PRODUCT_DIR)/xdisplaycheck<(EXECUTABLE_SUFFIX)',
         ],

diff --git a/chrome/sync_integration_tests.isolate b/chrome/sync_integration_tests.isolate
@@ -17,6 +17,7 @@
           '<(PRODUCT_DIR)/chrome_100_percent.pak',
           '<(PRODUCT_DIR)/libffmpegsumo.so',
           '<(PRODUCT_DIR)/libppGoogleNaClPluginChrome.so',
+          '<(PRODUCT_DIR)/lib/libmojo_system.so',
           '<(PRODUCT_DIR)/locales/en-US.pak',
           '<(PRODUCT_DIR)/nacl_helper<(EXECUTABLE_SUFFIX)',
           '<(PRODUCT_DIR)/nacl_helper_bootstrap<(EXECUTABLE_SUFFIX)',

diff --git a/chrome/tools/build/linux/FILES.cfg b/chrome/tools/build/linux/FILES.cfg
@@ -63,6 +63,12 @@ FILES = [
     'filename': 'libffmpegsumo.so',
     'buildtype': ['dev', 'official'],
   },
+  {
+    'filename': 'lib/libmojo_system.so',
+    'buildtype': ['dev', 'official'],
+    # TODO(sky): remove this when we remove use_mojo.
+    'optional': ['dev', 'official'],
+  },
   {
     'filename': 'lib/libpeerconnection.so',
     'buildtype': ['dev', 'official'],

diff --git a/chrome/unit_tests.isolate b/chrome/unit_tests.isolate
@@ -49,6 +49,7 @@
           '../testing/xvfb.py',
           '<(PRODUCT_DIR)/libffmpegsumo.so',
           '<(PRODUCT_DIR)/libosmesa.so',
+          '<(PRODUCT_DIR)/lib/libmojo_system.so',
           '<(PRODUCT_DIR)/locales/fr.pak',
           '<(PRODUCT_DIR)/xdisplaycheck<(EXECUTABLE_SUFFIX)',
         ],

diff --git a/content/content_browsertests.isolate b/content/content_browsertests.isolate
@@ -33,6 +33,7 @@
           '<(PRODUCT_DIR)/libclearkeycdm.so',
           '<(PRODUCT_DIR)/libclearkeycdmadapter.so',
           '<(PRODUCT_DIR)/libffmpegsumo.so',
+          '<(PRODUCT_DIR)/lib/libmojo_system.so',
           '<(PRODUCT_DIR)/plugins/libtest_netscape_plugin.so',
           '<(PRODUCT_DIR)/plugins/libnpapi_test_plugin.so',
         ],

diff --git a/content/content_unittests.isolate b/content/content_unittests.isolate
@@ -42,6 +42,7 @@
         'isolate_dependency_tracked': [
           '../testing/xvfb.py',
           '<(PRODUCT_DIR)/libffmpegsumo.so',
+          '<(PRODUCT_DIR)/lib/libmojo_system.so',
           '<(PRODUCT_DIR)/xdisplaycheck<(EXECUTABLE_SUFFIX)',
         ],
       },