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

Side by Side 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, 8 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | content/app/content_main_runner.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 # IMPORTANT: 5 # IMPORTANT:
6 # Please don't directly include this file if you are building via gyp_chromium, 6 # Please don't directly include this file if you are building via gyp_chromium,
7 # since gyp_chromium is automatically forcing its inclusion. 7 # since gyp_chromium is automatically forcing its inclusion.
8 { 8 {
9 # Variables expected to be overriden on the GYP command line (-D) or by 9 # Variables expected to be overriden on the GYP command line (-D) or by
10 # ~/.gyp/include.gypi. 10 # ~/.gyp/include.gypi.
(...skipping 260 matching lines...) Expand 10 before | Expand all | Expand 10 after
271 'use_goma%': '<(use_goma)', 271 'use_goma%': '<(use_goma)',
272 'gomadir%': '<(gomadir)', 272 'gomadir%': '<(gomadir)',
273 'enable_app_list%': '<(enable_app_list)', 273 'enable_app_list%': '<(enable_app_list)',
274 'use_default_render_theme%': '<(use_default_render_theme)', 274 'use_default_render_theme%': '<(use_default_render_theme)',
275 'buildtype%': '<(buildtype)', 275 'buildtype%': '<(buildtype)',
276 'branding%': '<(branding)', 276 'branding%': '<(branding)',
277 'arm_version%': '<(arm_version)', 277 'arm_version%': '<(arm_version)',
278 'sysroot%': '<(sysroot)', 278 'sysroot%': '<(sysroot)',
279 'chroot_cmd%': '<(chroot_cmd)', 279 'chroot_cmd%': '<(chroot_cmd)',
280 280
281 # Whether content/chrome is using mojo: see http://crbug.com/353602
282 'use_mojo%': 0,
283
284 # Set to 1 to enable fast builds. Set to 2 for even faster builds 281 # Set to 1 to enable fast builds. Set to 2 for even faster builds
285 # (it disables debug info for fastest compilation - only for use 282 # (it disables debug info for fastest compilation - only for use
286 # on compile-only bots). 283 # on compile-only bots).
287 'fastbuild%': 0, 284 'fastbuild%': 0,
288 285
289 # Set to 1 to enable dcheck in release. 286 # Set to 1 to enable dcheck in release.
290 'dcheck_always_on%': 0, 287 'dcheck_always_on%': 0,
291 288
292 # Set to 1 to make a build that disables unshipped tracing events. 289 # Set to 1 to make a build that disables unshipped tracing events.
293 # Note: this setting is ignored if buildtype=="Official". 290 # Note: this setting is ignored if buildtype=="Official".
(...skipping 558 matching lines...) Expand 10 before | Expand all | Expand 10 after
852 }, { 849 }, {
853 'v8_optimized_debug%': 2, 850 'v8_optimized_debug%': 2,
854 }], 851 }],
855 852
856 # Disable various features by default on embedded. 853 # Disable various features by default on embedded.
857 ['embedded==1', { 854 ['embedded==1', {
858 'remoting%': 0, 855 'remoting%': 0,
859 'enable_printing%': 0, 856 'enable_printing%': 0,
860 }], 857 }],
861 858
862 ['OS=="win" or OS=="linux" or OS=="mac" or OS=="android"', {
863 'use_mojo%': 1,
864 }],
865
866 # By default, use ICU data file (icudtl.dat) on all platforms 859 # By default, use ICU data file (icudtl.dat) on all platforms
867 # except when building Android WebView. 860 # except when building Android WebView.
868 # TODO(jshin): Handle 'use_system_icu' on Linux (Chromium). 861 # TODO(jshin): Handle 'use_system_icu' on Linux (Chromium).
869 ['android_webview_build==0', { 862 ['android_webview_build==0', {
870 'icu_use_data_file_flag%' : 1, 863 'icu_use_data_file_flag%' : 1,
871 }, { 864 }, {
872 'icu_use_data_file_flag%' : 0, 865 'icu_use_data_file_flag%' : 0,
873 }], 866 }],
874 ], 867 ],
875 868
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after
927 'branding%': '<(branding)', 920 'branding%': '<(branding)',
928 'buildtype%': '<(buildtype)', 921 'buildtype%': '<(buildtype)',
929 'target_arch%': '<(target_arch)', 922 'target_arch%': '<(target_arch)',
930 'target_subarch%': '<(target_subarch)', 923 'target_subarch%': '<(target_subarch)',
931 'host_arch%': '<(host_arch)', 924 'host_arch%': '<(host_arch)',
932 'toolkit_views%': '<(toolkit_views)', 925 'toolkit_views%': '<(toolkit_views)',
933 'ui_compositor_image_transport%': '<(ui_compositor_image_transport)', 926 'ui_compositor_image_transport%': '<(ui_compositor_image_transport)',
934 'use_aura%': '<(use_aura)', 927 'use_aura%': '<(use_aura)',
935 'use_ash%': '<(use_ash)', 928 'use_ash%': '<(use_ash)',
936 'use_cras%': '<(use_cras)', 929 'use_cras%': '<(use_cras)',
937 'use_mojo%': '<(use_mojo)',
938 'use_openssl%': '<(use_openssl)', 930 'use_openssl%': '<(use_openssl)',
939 'use_openssl_certs%': '<(use_openssl_certs)', 931 'use_openssl_certs%': '<(use_openssl_certs)',
940 'use_nss%': '<(use_nss)', 932 'use_nss%': '<(use_nss)',
941 'use_udev%': '<(use_udev)', 933 'use_udev%': '<(use_udev)',
942 'os_bsd%': '<(os_bsd)', 934 'os_bsd%': '<(os_bsd)',
943 'os_posix%': '<(os_posix)', 935 'os_posix%': '<(os_posix)',
944 'use_dbus%': '<(use_dbus)', 936 'use_dbus%': '<(use_dbus)',
945 'use_glib%': '<(use_glib)', 937 'use_glib%': '<(use_glib)',
946 'use_pango%': '<(use_pango)', 938 'use_pango%': '<(use_pango)',
947 'use_cairo%': '<(use_cairo)', 939 'use_cairo%': '<(use_cairo)',
(...skipping 835 matching lines...) Expand 10 before | Expand all | Expand 10 after
1783 }], 1775 }],
1784 ['chromeos==1', { 1776 ['chromeos==1', {
1785 'grit_defines': ['-D', 'chromeos', '-D', 'scale_factors=2x'], 1777 'grit_defines': ['-D', 'chromeos', '-D', 'scale_factors=2x'],
1786 }], 1778 }],
1787 ['desktop_linux==1', { 1779 ['desktop_linux==1', {
1788 'grit_defines': ['-D', 'desktop_linux'], 1780 'grit_defines': ['-D', 'desktop_linux'],
1789 }], 1781 }],
1790 ['toolkit_views==1', { 1782 ['toolkit_views==1', {
1791 'grit_defines': ['-D', 'toolkit_views'], 1783 'grit_defines': ['-D', 'toolkit_views'],
1792 }], 1784 }],
1793 ['use_mojo==1', {
1794 'grit_defines': ['-D', 'use_mojo'],
1795 }],
1796 ['toolkit_uses_gtk==1', { 1785 ['toolkit_uses_gtk==1', {
1797 'grit_defines': ['-D', 'toolkit_uses_gtk'], 1786 'grit_defines': ['-D', 'toolkit_uses_gtk'],
1798 }], 1787 }],
1799 ['use_aura==1', { 1788 ['use_aura==1', {
1800 'grit_defines': ['-D', 'use_aura'], 1789 'grit_defines': ['-D', 'use_aura'],
1801 }], 1790 }],
1802 ['use_ash==1', { 1791 ['use_ash==1', {
1803 'grit_defines': ['-D', 'use_ash'], 1792 'grit_defines': ['-D', 'use_ash'],
1804 }], 1793 }],
1805 ['use_nss==1', { 1794 ['use_nss==1', {
(...skipping 473 matching lines...) Expand 10 before | Expand all | Expand 10 after
2279 }], 2268 }],
2280 ['use_ozone==1', { 2269 ['use_ozone==1', {
2281 'defines': ['USE_OZONE=1'], 2270 'defines': ['USE_OZONE=1'],
2282 }], 2271 }],
2283 ['use_default_render_theme==1', { 2272 ['use_default_render_theme==1', {
2284 'defines': ['USE_DEFAULT_RENDER_THEME=1'], 2273 'defines': ['USE_DEFAULT_RENDER_THEME=1'],
2285 }], 2274 }],
2286 ['use_libjpeg_turbo==1', { 2275 ['use_libjpeg_turbo==1', {
2287 'defines': ['USE_LIBJPEG_TURBO=1'], 2276 'defines': ['USE_LIBJPEG_TURBO=1'],
2288 }], 2277 }],
2289 ['use_mojo==1', {
2290 'defines': ['USE_MOJO=1'],
2291 }],
2292 ['use_x11==1', { 2278 ['use_x11==1', {
2293 'defines': ['USE_X11=1'], 2279 'defines': ['USE_X11=1'],
2294 }], 2280 }],
2295 ['use_clipboard_aurax11==1', { 2281 ['use_clipboard_aurax11==1', {
2296 'defines': ['USE_CLIPBOARD_AURAX11=1'], 2282 'defines': ['USE_CLIPBOARD_AURAX11=1'],
2297 }], 2283 }],
2298 ['enable_one_click_signin==1', { 2284 ['enable_one_click_signin==1', {
2299 'defines': ['ENABLE_ONE_CLICK_SIGNIN'], 2285 'defines': ['ENABLE_ONE_CLICK_SIGNIN'],
2300 }], 2286 }],
2301 ['toolkit_uses_gtk==1 and toolkit_views==0', { 2287 ['toolkit_uses_gtk==1 and toolkit_views==0', {
(...skipping 2908 matching lines...) Expand 10 before | Expand all | Expand 10 after
5210 # settings in target dicts. SYMROOT is a special case, because many other 5196 # settings in target dicts. SYMROOT is a special case, because many other
5211 # Xcode variables depend on it, including variables such as 5197 # Xcode variables depend on it, including variables such as
5212 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 5198 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
5213 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 5199 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
5214 # files to appear (when present) in the UI as actual files and not red 5200 # files to appear (when present) in the UI as actual files and not red
5215 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 5201 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
5216 # and therefore SYMROOT, needs to be set at the project level. 5202 # and therefore SYMROOT, needs to be set at the project level.
5217 'SYMROOT': '<(DEPTH)/xcodebuild', 5203 'SYMROOT': '<(DEPTH)/xcodebuild',
5218 }, 5204 },
5219 } 5205 }
OLDNEW
« 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