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

Unified Diff: build/common.gypi

Issue 226213002: Removes use_mojo (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: merge 2 trunk 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
« no previous file with comments | « no previous file | content/app/content_main_runner.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/common.gypi
diff --git a/build/common.gypi b/build/common.gypi
index bf028f8612b359105ab31f5157ce3a66b5f7f70d..33b1b038200b99ffb0caa235b9abf19d8abba556 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -278,9 +278,6 @@
'sysroot%': '<(sysroot)',
'chroot_cmd%': '<(chroot_cmd)',
- # Whether content/chrome is using mojo: see http://crbug.com/353602
- 'use_mojo%': 0,
-
# Set to 1 to enable fast builds. Set to 2 for even faster builds
# (it disables debug info for fastest compilation - only for use
# on compile-only bots).
@@ -859,10 +856,6 @@
'enable_printing%': 0,
}],
- ['OS=="win" or OS=="linux" or OS=="mac" or OS=="android"', {
- 'use_mojo%': 1,
- }],
-
# By default, use ICU data file (icudtl.dat) on all platforms
# except when building Android WebView.
# TODO(jshin): Handle 'use_system_icu' on Linux (Chromium).
@@ -934,7 +927,6 @@
'use_aura%': '<(use_aura)',
'use_ash%': '<(use_ash)',
'use_cras%': '<(use_cras)',
- 'use_mojo%': '<(use_mojo)',
'use_openssl%': '<(use_openssl)',
'use_openssl_certs%': '<(use_openssl_certs)',
'use_nss%': '<(use_nss)',
@@ -1790,9 +1782,6 @@
['toolkit_views==1', {
'grit_defines': ['-D', 'toolkit_views'],
}],
- ['use_mojo==1', {
- 'grit_defines': ['-D', 'use_mojo'],
- }],
['toolkit_uses_gtk==1', {
'grit_defines': ['-D', 'toolkit_uses_gtk'],
}],
@@ -2286,9 +2275,6 @@
['use_libjpeg_turbo==1', {
'defines': ['USE_LIBJPEG_TURBO=1'],
}],
- ['use_mojo==1', {
- 'defines': ['USE_MOJO=1'],
- }],
['use_x11==1', {
'defines': ['USE_X11=1'],
}],
« no previous file with comments | « no previous file | content/app/content_main_runner.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698