diff options
author | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-19 19:39:02 +0000 |
---|---|---|
committer | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-19 19:39:02 +0000 |
commit | 03c8f13a414b4df842f18ebae166c51a939d50ae (patch) | |
tree | a0f1abcee9f7ff5d3402ef7a5286231558eba824 | |
parent | 106d98f1f1cbeb7e57fe46a4d372582258ad0c6d (diff) | |
download | chromium_src-03c8f13a414b4df842f18ebae166c51a939d50ae.zip chromium_src-03c8f13a414b4df842f18ebae166c51a939d50ae.tar.gz chromium_src-03c8f13a414b4df842f18ebae166c51a939d50ae.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
Review URL: https://codereview.chromium.org/203963003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@258062 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r-- | build/common.gypi | 4 | ||||
-rw-r--r-- | chrome/chrome.isolate | 1 | ||||
-rw-r--r-- | chrome/chrome_installer.gypi | 1 | ||||
-rw-r--r-- | chrome/installer/linux/common/installer.include | 2 | ||||
-rw-r--r-- | chrome/interactive_ui_tests.isolate | 1 | ||||
-rw-r--r-- | chrome/sync_integration_tests.isolate | 1 | ||||
-rwxr-xr-x | chrome/test/chromeos/autotest/files/client/deps/chrome_test/setup_test_links.sh | 1 | ||||
-rwxr-xr-x | chrome/test/chromeos/autotest/files/client/deps/pyauto_dep/setup_test_links.sh | 2 | ||||
-rw-r--r-- | chrome/tools/build/chromeos/FILES.cfg | 4 | ||||
-rw-r--r-- | chrome/tools/build/linux/FILES.cfg | 4 | ||||
-rw-r--r-- | chrome/unit_tests.isolate | 1 | ||||
-rw-r--r-- | content/content_browsertests.isolate | 1 | ||||
-rw-r--r-- | content/content_unittests.isolate | 1 |
13 files changed, 24 insertions, 0 deletions
diff --git a/build/common.gypi b/build/common.gypi index dfc7abe..5db461d 100644 --- a/build/common.gypi +++ b/build/common.gypi @@ -846,6 +846,10 @@ }, { 'icu_use_data_file_flag%' : 0, }], + + ['OS=="linux"', { + 'use_mojo%': 1, + }], ], # Set this to 1 to enable use of concatenated impulse responses diff --git a/chrome/chrome.isolate b/chrome/chrome.isolate index 6a92211..8b48e12 100644 --- 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 index a11d099..3fa5a49 100644 --- a/chrome/chrome_installer.gypi +++ b/chrome/chrome_installer.gypi @@ -490,6 +490,7 @@ '<(PRODUCT_DIR)/chrome_sandbox', '<(PRODUCT_DIR)/libffmpegsumo.so', '<(PRODUCT_DIR)/libppGoogleNaClPluginChrome.so', + '<(PRODUCT_DIR)/lib/libmojo_system.so', '<(PRODUCT_DIR)/xdg-mime', '<(PRODUCT_DIR)/xdg-settings', '<(PRODUCT_DIR)/locales/en-US.pak', diff --git a/chrome/installer/linux/common/installer.include b/chrome/installer/linux/common/installer.include index 9123a6e..4d006ae 100644 --- a/chrome/installer/linux/common/installer.include +++ b/chrome/installer/linux/common/installer.include @@ -150,6 +150,8 @@ stage_install_common() { # ffmpeg libs install -m 644 -s "${BUILDDIR}/libffmpegsumo.so" "${STAGEDIR}/${INSTALLDIR}/" + install -m 644 -s "${BUILDDIR}/lib/libmojo_system.so" "${STAGEDIR}/${INSTALLDIR}/lib/" + # Widevine CDM. if [ -f "${BUILDDIR}/libwidevinecdmadapter.so" ]; then install -m 644 -s "${BUILDDIR}/libwidevinecdmadapter.so" "${STAGEDIR}/${INSTALLDIR}/" diff --git a/chrome/interactive_ui_tests.isolate b/chrome/interactive_ui_tests.isolate index 3d2a109..871c288 100644 --- 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 index 7324cf5..8af9afa 100644 --- 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/test/chromeos/autotest/files/client/deps/chrome_test/setup_test_links.sh b/chrome/test/chromeos/autotest/files/client/deps/chrome_test/setup_test_links.sh index 48ef6e7..2fa2389 100755 --- a/chrome/test/chromeos/autotest/files/client/deps/chrome_test/setup_test_links.sh +++ b/chrome/test/chromeos/autotest/files/client/deps/chrome_test/setup_test_links.sh @@ -55,6 +55,7 @@ link_from_pyauto_dep \ "$pyauto_dep_dir/test_src/out/Release/suid-python" \ "$pyauto_dep_dir/test_src/out/Release/_pyautolib.so" \ "$pyauto_dep_dir/test_src/out/Release/libffmpegsumo.so" \ + "$pyauto_dep_dir/test_src/out/Release/lib/libmojo_system.so" \ "$pyauto_dep_dir/test_src/third_party"/* # Make sure the test files are owned by chronos as some browser_tests emit diff --git a/chrome/test/chromeos/autotest/files/client/deps/pyauto_dep/setup_test_links.sh b/chrome/test/chromeos/autotest/files/client/deps/pyauto_dep/setup_test_links.sh index 2be6bd2..685333d 100755 --- a/chrome/test/chromeos/autotest/files/client/deps/pyauto_dep/setup_test_links.sh +++ b/chrome/test/chromeos/autotest/files/client/deps/pyauto_dep/setup_test_links.sh @@ -13,3 +13,5 @@ ln -f -s /opt/google/chrome/chrome $(dirname $0)/chrome $(dirname $0)/resources ln -f -s /opt/google/chrome/*.pak $(dirname $0)/ ln -f -s /opt/google/chrome/libffmpegsumo.so $(dirname $0)/libffmpegsumo.so +ln -f -s /opt/google/chrome/lib/libmojo_system.so \ + $(dirname $0)/lib/libmojo_system.so diff --git a/chrome/tools/build/chromeos/FILES.cfg b/chrome/tools/build/chromeos/FILES.cfg index 97e002a..9e077db 100644 --- a/chrome/tools/build/chromeos/FILES.cfg +++ b/chrome/tools/build/chromeos/FILES.cfg @@ -57,6 +57,10 @@ FILES = [ 'buildtype': ['dev', 'official'], }, { + 'filename': 'lib/libmojo_system.so', + 'buildtype': ['dev', 'official'], + }, + { 'filename': 'lib/libpeerconnection.so', 'buildtype': ['dev', 'official'], 'optional': ['dev', 'official'], diff --git a/chrome/tools/build/linux/FILES.cfg b/chrome/tools/build/linux/FILES.cfg index 7cbdc49..fd547bc 100644 --- a/chrome/tools/build/linux/FILES.cfg +++ b/chrome/tools/build/linux/FILES.cfg @@ -64,6 +64,10 @@ FILES = [ 'buildtype': ['dev', 'official'], }, { + 'filename': 'lib/libmojo_system.so', + 'buildtype': ['dev', 'official'], + }, + { 'filename': 'lib/libpeerconnection.so', 'buildtype': ['dev', 'official'], 'optional': ['dev', 'official'], diff --git a/chrome/unit_tests.isolate b/chrome/unit_tests.isolate index f35ecc8..346e220 100644 --- 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 index 41ebc19..bb55f12 100644 --- 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 index 76ad361..c2e7e01 100644 --- a/content/content_unittests.isolate +++ b/content/content_unittests.isolate @@ -41,6 +41,7 @@ ], 'isolate_dependency_tracked': [ '../testing/xvfb.py', + '<(PRODUCT_DIR)/lib/libmojo_system.so', '<(PRODUCT_DIR)/libffmpegsumo.so', '<(PRODUCT_DIR)/xdisplaycheck<(EXECUTABLE_SUFFIX)', ], |