summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--build/common.gypi4
-rw-r--r--chrome/browser_tests.isolate1
-rw-r--r--chrome/chrome.isolate1
-rw-r--r--chrome/installer/mini_installer.gyp6
-rw-r--r--chrome/installer/mini_installer.gypi6
-rw-r--r--chrome/installer/mini_installer/chrome.release1
-rw-r--r--chrome/interactive_ui_tests.isolate1
-rw-r--r--chrome/tools/build/win/FILES.cfg25
-rw-r--r--chrome/unit_tests.isolate1
-rw-r--r--content/content_browsertests.isolate1
-rw-r--r--content/content_unittests.isolate1
11 files changed, 48 insertions, 0 deletions
diff --git a/build/common.gypi b/build/common.gypi
index f097744..99d2008 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -837,6 +837,10 @@
'remoting%': 0,
'enable_printing%': 0,
}],
+
+ ['OS=="win"', {
+ 'use_mojo%': 1,
+ }],
],
# Set this to 1 to enable use of concatenated impulse responses
diff --git a/chrome/browser_tests.isolate b/chrome/browser_tests.isolate
index 146c9f6..6387da4 100644
--- a/chrome/browser_tests.isolate
+++ b/chrome/browser_tests.isolate
@@ -138,6 +138,7 @@
'<(PRODUCT_DIR)/chrome_elf.dll',
'<(PRODUCT_DIR)/clearkeycdm.dll',
'<(PRODUCT_DIR)/clearkeycdmadapter.dll',
+ '<(PRODUCT_DIR)/mojo_system.dll',
'<(PRODUCT_DIR)/ppapi_tests.dll',
'<(PRODUCT_DIR)/security_tests.dll',
'tools/build/repack_locales.py',
diff --git a/chrome/chrome.isolate b/chrome/chrome.isolate
index 6a92211..b27a2ac 100644
--- a/chrome/chrome.isolate
+++ b/chrome/chrome.isolate
@@ -65,6 +65,7 @@
'<(PRODUCT_DIR)/ffmpegsumo.dll',
'<(PRODUCT_DIR)/libEGL.dll',
'<(PRODUCT_DIR)/libGLESv2.dll',
+ '<(PRODUCT_DIR)/mojo_system.dll',
'<(PRODUCT_DIR)/nacl64<(EXECUTABLE_SUFFIX)',
'<(PRODUCT_DIR)/osmesa.dll',
'<(PRODUCT_DIR)/ppGoogleNaClPluginChrome.dll',
diff --git a/chrome/installer/mini_installer.gyp b/chrome/installer/mini_installer.gyp
index bb92eb2..5c3311f 100644
--- a/chrome/installer/mini_installer.gyp
+++ b/chrome/installer/mini_installer.gyp
@@ -223,11 +223,17 @@
'<(PRODUCT_DIR)/icudtl.dat',
],
}],
+ ['use_mojo==0', {
+ 'inputs!': [
+ '<(PRODUCT_DIR)/mojo_system.dll',
+ ],
+ }],
],
'inputs': [
'<(create_installer_archive_py_path)',
'<(PRODUCT_DIR)/chrome.exe',
'<(PRODUCT_DIR)/chrome.dll',
+ '<(PRODUCT_DIR)/mojo_system.dll',
'<(PRODUCT_DIR)/nacl64.exe',
'<(PRODUCT_DIR)/ppGoogleNaClPluginChrome.dll',
'<(PRODUCT_DIR)/nacl_irt_x86_32.nexe',
diff --git a/chrome/installer/mini_installer.gypi b/chrome/installer/mini_installer.gypi
index ef0ccf4..d3375fd 100644
--- a/chrome/installer/mini_installer.gypi
+++ b/chrome/installer/mini_installer.gypi
@@ -185,11 +185,17 @@
'<(PRODUCT_DIR)/icudtl.dat',
],
}],
+ ['use_mojo==0', {
+ 'inputs!': [
+ '<(PRODUCT_DIR)/mojo_system.dll',
+ ],
+ }],
],
'inputs': [
'<(create_installer_archive_py_path)',
'<(PRODUCT_DIR)/chrome.exe',
'<@(chrome_dll_path)',
+ '<(PRODUCT_DIR)/mojo_system.dll',
'<(PRODUCT_DIR)/nacl64.exe',
'<(PRODUCT_DIR)/ppGoogleNaClPluginChrome.dll',
'<(PRODUCT_DIR)/nacl_irt_x86_32.nexe',
diff --git a/chrome/installer/mini_installer/chrome.release b/chrome/installer/mini_installer/chrome.release
index 66ab4de..2ae6a3c 100644
--- a/chrome/installer/mini_installer/chrome.release
+++ b/chrome/installer/mini_installer/chrome.release
@@ -29,6 +29,7 @@ icudt.dll: %(VersionDir)s\
icudtl.dat: %(VersionDir)s\
libEGL.dll: %(VersionDir)s\
libGLESv2.dll: %(VersionDir)s\
+mojo_system.dll: %(VersionDir)s\
nacl64.exe: %(VersionDir)s\
nacl_irt_x86_32.nexe: %(VersionDir)s\
nacl_irt_x86_64.nexe: %(VersionDir)s\
diff --git a/chrome/interactive_ui_tests.isolate b/chrome/interactive_ui_tests.isolate
index 3d2a109..5da06fd 100644
--- a/chrome/interactive_ui_tests.isolate
+++ b/chrome/interactive_ui_tests.isolate
@@ -85,6 +85,7 @@
'<(PRODUCT_DIR)/ffmpegsumo.dll',
'<(PRODUCT_DIR)/libEGL.dll',
'<(PRODUCT_DIR)/libGLESv2.dll',
+ '<(PRODUCT_DIR)/mojo_system.dll',
'<(PRODUCT_DIR)/ppGoogleNaClPluginChrome.dll',
'<(PRODUCT_DIR)/osmesa.dll',
],
diff --git a/chrome/tools/build/win/FILES.cfg b/chrome/tools/build/win/FILES.cfg
index 0e96eb1..6883f45 100644
--- a/chrome/tools/build/win/FILES.cfg
+++ b/chrome/tools/build/win/FILES.cfg
@@ -306,6 +306,11 @@ FILES = [
'buildtype': ['dev', 'official'],
},
{
+ 'filename': 'mojo_system.dll',
+ 'buildtype': ['dev', 'official'],
+ 'filegroup': ['default', 'symsrc'],
+ },
+ {
'filename': 'policy_templates.zip',
'buildtype': ['official'],
'archive': 'policy_templates.zip',
@@ -567,6 +572,14 @@ FILES = [
'optional': ['dev'],
},
{
+ 'filename': 'syzygy/mojo_system.dll',
+ 'arch': ['32bit'],
+ 'buildtype': ['dev', 'official'],
+ 'archive': 'syzygy/mojo_system.dll',
+ 'filegroup': ['symsrc'],
+ 'optional': ['dev'],
+ },
+ {
'filename': 'syzygy/syzyasan_rtl.dll',
'arch': ['32bit'],
'buildtype': ['dev', 'official'],
@@ -675,6 +688,11 @@ FILES = [
'archive': 'chrome-win32-syms.zip',
},
{
+ 'filename': 'mojo_system.dll.pdb',
+ 'buildtype': ['dev', 'official'],
+ 'archive': 'chrome-win32-syms.zip',
+ },
+ {
'filename': 'nacl64.exe.pdb',
'arch': ['32bit'],
'buildtype': ['dev', 'official'],
@@ -712,6 +730,13 @@ FILES = [
'optional': ['dev'],
},
{
+ 'filename': 'syzygy/mojo_system.dll.pdb',
+ 'arch': ['32bit'],
+ 'buildtype': ['dev', 'official'],
+ 'archive': 'chrome-win32-syms.zip',
+ 'optional': ['dev'],
+ },
+ {
'filename': 'syzygy/syzyasan_rtl.dll.pdb',
'arch': ['32bit'],
'buildtype': ['dev', 'official'],
diff --git a/chrome/unit_tests.isolate b/chrome/unit_tests.isolate
index f35ecc8..0c92f9f 100644
--- a/chrome/unit_tests.isolate
+++ b/chrome/unit_tests.isolate
@@ -112,6 +112,7 @@
'isolate_dependency_tracked': [
'<(PRODUCT_DIR)/chrome_elf.dll',
'<(PRODUCT_DIR)/ffmpegsumo.dll',
+ '<(PRODUCT_DIR)/mojo_system.dll',
'<(PRODUCT_DIR)/osmesa.dll',
],
'isolate_dependency_untracked': [
diff --git a/content/content_browsertests.isolate b/content/content_browsertests.isolate
index 41ebc19..9e39d37 100644
--- a/content/content_browsertests.isolate
+++ b/content/content_browsertests.isolate
@@ -86,6 +86,7 @@
'<(PRODUCT_DIR)/clearkeycdm.dll',
'<(PRODUCT_DIR)/clearkeycdmadapter.dll',
'<(PRODUCT_DIR)/content_shell.pak',
+ '<(PRODUCT_DIR)/mojo_system.dll',
'<(PRODUCT_DIR)/plugins/np_test_netscape_plugin.dll',
'<(PRODUCT_DIR)/plugins/npapi_test_plugin.dll',
],
diff --git a/content/content_unittests.isolate b/content/content_unittests.isolate
index 76ad361..4571898 100644
--- a/content/content_unittests.isolate
+++ b/content/content_unittests.isolate
@@ -69,6 +69,7 @@
],
'isolate_dependency_tracked': [
'<(PRODUCT_DIR)/ffmpegsumo.dll',
+ '<(PRODUCT_DIR)/mojo_system.dll',
'<(PRODUCT_DIR)/ui_test.pak',
],
},
generated by cgit v1.1 at 2025-03-27 19:25:09 +0000