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

Side by Side Diff: build/common.gypi

Issue 9071013: Introduce use_ash macro/gyp define. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 11 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 | no next file » | 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) 2011 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2011 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 12 matching lines...) Expand all
23 'variables': { 23 'variables': {
24 # Whether we're building a ChromeOS build. 24 # Whether we're building a ChromeOS build.
25 'chromeos%': 0, 25 'chromeos%': 0,
26 26
27 # Whether we are using Views Toolkit 27 # Whether we are using Views Toolkit
28 'toolkit_views%': 0, 28 'toolkit_views%': 0,
29 29
30 # Whether the compositor is enabled on views. 30 # Whether the compositor is enabled on views.
31 'views_compositor%': 0, 31 'views_compositor%': 0,
32 32
33 # Whether or not we are building with the Aura window manager. 33 # Whether or not we are using the Aura windowing framework.
34 'use_aura%': 0, 34 'use_aura%': 0,
35
36 # Whether or not we are building the Ash shell.
37 'use_ash%': 0,
35 38
36 # Use OpenSSL instead of NSS. Under development: see http://crbug.com/ 62803 39 # Use OpenSSL instead of NSS. Under development: see http://crbug.com/ 62803
37 'use_openssl%': 0, 40 'use_openssl%': 0,
38 41
39 # Disable Virtual keyboard support by default. 42 # Disable Virtual keyboard support by default.
40 'use_virtual_keyboard%': 0, 43 'use_virtual_keyboard%': 0,
41 44
42 # Default setting for use_skia on mac platform. 45 # Default setting for use_skia on mac platform.
43 # This is typically overridden in use_skia_on_mac.gypi. 46 # This is typically overridden in use_skia_on_mac.gypi.
44 'use_skia_on_mac%': 0, 47 'use_skia_on_mac%': 0,
45 }, 48 },
46 # Copy conditionally-set variables out one scope. 49 # Copy conditionally-set variables out one scope.
47 'chromeos%': '<(chromeos)', 50 'chromeos%': '<(chromeos)',
48 'views_compositor%': '<(views_compositor)', 51 'views_compositor%': '<(views_compositor)',
49 'use_aura%': '<(use_aura)', 52 'use_aura%': '<(use_aura)',
53 'use_ash%': '<(use_ash)',
50 'use_openssl%': '<(use_openssl)', 54 'use_openssl%': '<(use_openssl)',
51 'use_virtual_keyboard%': '<(use_virtual_keyboard)', 55 'use_virtual_keyboard%': '<(use_virtual_keyboard)',
52 'use_skia_on_mac%': '<(use_skia_on_mac)', 56 'use_skia_on_mac%': '<(use_skia_on_mac)',
53 57
54 # Compute the architecture that we're building on. 58 # Compute the architecture that we're building on.
55 'conditions': [ 59 'conditions': [
56 [ 'OS=="win" or OS=="mac"', { 60 [ 'OS=="win" or OS=="mac"', {
57 'host_arch%': 'ia32', 61 'host_arch%': 'ia32',
58 }, { 62 }, {
59 # This handles the Unix platforms for which there is some support. 63 # This handles the Unix platforms for which there is some support.
60 # Anything else gets passed through, which probably won't work very 64 # Anything else gets passed through, which probably won't work very
61 # well; such hosts should pass an explicit target_arch to gyp. 65 # well; such hosts should pass an explicit target_arch to gyp.
62 'host_arch%': 66 'host_arch%':
63 '<!(uname -m | sed -e "s/i.86/ia32/;s/x86_64/x64/;s/amd64/x64/;s/a rm.*/arm/;s/i86pc/ia32/")', 67 '<!(uname -m | sed -e "s/i.86/ia32/;s/x86_64/x64/;s/amd64/x64/;s/a rm.*/arm/;s/i86pc/ia32/")',
64 }], 68 }],
69
70 # Ash requires Aura.
71 ['use_ash==1', {
72 'use_aura%': 1,
73 }],
65 74
66 # Set default value of toolkit_views based on OS. 75 # Set default value of toolkit_views based on OS.
67 ['OS=="win" or chromeos==1 or use_aura==1', { 76 ['OS=="win" or chromeos==1 or use_aura==1', {
68 'toolkit_views%': 1, 77 'toolkit_views%': 1,
69 }, { 78 }, {
70 'toolkit_views%': 0, 79 'toolkit_views%': 0,
71 }], 80 }],
72 81
73 # Use the views compositor when using the Aura window manager. 82 # Use the views compositor when using the Aura window manager.
74 ['use_aura==1', { 83 ['use_aura==1', {
75 'views_compositor%': 1, 84 'views_compositor%': 1,
76 }], 85 }],
77 86
78 # Use the WebKit compositor for ui, when Aura is on. 87 # Use the WebKit compositor for ui, when Aura is on.
79 ['use_aura==1', { 88 ['use_aura==1', {
80 'use_webkit_compositor%': 1, 89 'use_webkit_compositor%': 1,
81 }, { 90 }, {
82 'use_webkit_compositor%': 0, 91 'use_webkit_compositor%': 0,
83 }], 92 }],
84 ], 93 ],
85 }, 94 },
86 95
87 # Copy conditionally-set variables out one scope. 96 # Copy conditionally-set variables out one scope.
88 'chromeos%': '<(chromeos)', 97 'chromeos%': '<(chromeos)',
89 'host_arch%': '<(host_arch)', 98 'host_arch%': '<(host_arch)',
90 'toolkit_views%': '<(toolkit_views)', 99 'toolkit_views%': '<(toolkit_views)',
91 'views_compositor%': '<(views_compositor)', 100 'views_compositor%': '<(views_compositor)',
92 'use_webkit_compositor%': '<(use_webkit_compositor)', 101 'use_webkit_compositor%': '<(use_webkit_compositor)',
93 'use_aura%': '<(use_aura)', 102 'use_aura%': '<(use_aura)',
103 'use_ash%': '<(use_ash)',
94 'use_openssl%': '<(use_openssl)', 104 'use_openssl%': '<(use_openssl)',
95 'use_virtual_keyboard%': '<(use_virtual_keyboard)', 105 'use_virtual_keyboard%': '<(use_virtual_keyboard)',
96 'use_skia_on_mac%': '<(use_skia_on_mac)', 106 'use_skia_on_mac%': '<(use_skia_on_mac)',
97 107
98 # We used to provide a variable for changing how libraries were built. 108 # We used to provide a variable for changing how libraries were built.
99 # This variable remains until we can clean up all the users. 109 # This variable remains until we can clean up all the users.
100 # This needs to be one nested variables dict in so that dependent 110 # This needs to be one nested variables dict in so that dependent
101 # gyp files can make use of it in their outer variables. (Yikes!) 111 # gyp files can make use of it in their outer variables. (Yikes!)
102 # http://code.google.com/p/chromium/issues/detail?id=83308 112 # http://code.google.com/p/chromium/issues/detail?id=83308
103 'library%': 'static_library', 113 'library%': 'static_library',
(...skipping 246 matching lines...) Expand 10 before | Expand all | Expand 10 after
350 'branding%': '<(branding)', 360 'branding%': '<(branding)',
351 'buildtype%': '<(buildtype)', 361 'buildtype%': '<(buildtype)',
352 'target_arch%': '<(target_arch)', 362 'target_arch%': '<(target_arch)',
353 'host_arch%': '<(host_arch)', 363 'host_arch%': '<(host_arch)',
354 'library%': 'static_library', 364 'library%': 'static_library',
355 'toolkit_views%': '<(toolkit_views)', 365 'toolkit_views%': '<(toolkit_views)',
356 'views_compositor%': '<(views_compositor)', 366 'views_compositor%': '<(views_compositor)',
357 'ui_compositor_image_transport%': '<(ui_compositor_image_transport)', 367 'ui_compositor_image_transport%': '<(ui_compositor_image_transport)',
358 'use_webkit_compositor%': '<(use_webkit_compositor)', 368 'use_webkit_compositor%': '<(use_webkit_compositor)',
359 'use_aura%': '<(use_aura)', 369 'use_aura%': '<(use_aura)',
370 'use_ash%': '<(use_ash)',
360 'use_openssl%': '<(use_openssl)', 371 'use_openssl%': '<(use_openssl)',
361 'use_nss%': '<(use_nss)', 372 'use_nss%': '<(use_nss)',
362 'os_bsd%': '<(os_bsd)', 373 'os_bsd%': '<(os_bsd)',
363 'os_posix%': '<(os_posix)', 374 'os_posix%': '<(os_posix)',
364 'use_glib%': '<(use_glib)', 375 'use_glib%': '<(use_glib)',
365 'toolkit_uses_gtk%': '<(toolkit_uses_gtk)', 376 'toolkit_uses_gtk%': '<(toolkit_uses_gtk)',
366 'use_skia%': '<(use_skia)', 377 'use_skia%': '<(use_skia)',
367 'use_x11%': '<(use_x11)', 378 'use_x11%': '<(use_x11)',
368 'use_gnome_keyring%': '<(use_gnome_keyring)', 379 'use_gnome_keyring%': '<(use_gnome_keyring)',
369 'linux_fpic%': '<(linux_fpic)', 380 'linux_fpic%': '<(linux_fpic)',
(...skipping 458 matching lines...) Expand 10 before | Expand all | Expand 10 after
828 }], 839 }],
829 ['chromeos==1', { 840 ['chromeos==1', {
830 'grit_defines': ['-D', 'chromeos'], 841 'grit_defines': ['-D', 'chromeos'],
831 }], 842 }],
832 ['toolkit_views==1', { 843 ['toolkit_views==1', {
833 'grit_defines': ['-D', 'toolkit_views'], 844 'grit_defines': ['-D', 'toolkit_views'],
834 }], 845 }],
835 ['use_aura==1', { 846 ['use_aura==1', {
836 'grit_defines': ['-D', 'use_aura'], 847 'grit_defines': ['-D', 'use_aura'],
837 }], 848 }],
849 ['use_ash==1', {
850 'grit_defines': ['-D', 'use_ash'],
851 }],
838 ['use_nss==1', { 852 ['use_nss==1', {
839 'grit_defines': ['-D', 'use_nss'], 853 'grit_defines': ['-D', 'use_nss'],
840 }], 854 }],
841 ['use_virtual_keyboard==1', { 855 ['use_virtual_keyboard==1', {
842 'grit_defines': ['-D', 'use_virtual_keyboard'], 856 'grit_defines': ['-D', 'use_virtual_keyboard'],
843 }], 857 }],
844 ['file_manager_extension==1', { 858 ['file_manager_extension==1', {
845 'grit_defines': ['-D', 'file_manager_extension'], 859 'grit_defines': ['-D', 'file_manager_extension'],
846 }], 860 }],
847 ['webui_task_manager==1', { 861 ['webui_task_manager==1', {
(...skipping 154 matching lines...) Expand 10 before | Expand all | Expand 10 after
1002 }], 1016 }],
1003 ['ui_compositor_image_transport==1', { 1017 ['ui_compositor_image_transport==1', {
1004 'defines': ['UI_COMPOSITOR_IMAGE_TRANSPORT'], 1018 'defines': ['UI_COMPOSITOR_IMAGE_TRANSPORT'],
1005 }], 1019 }],
1006 ['use_webkit_compositor==1', { 1020 ['use_webkit_compositor==1', {
1007 'defines': ['USE_WEBKIT_COMPOSITOR=1'], 1021 'defines': ['USE_WEBKIT_COMPOSITOR=1'],
1008 }], 1022 }],
1009 ['use_aura==1', { 1023 ['use_aura==1', {
1010 'defines': ['USE_AURA=1'], 1024 'defines': ['USE_AURA=1'],
1011 }], 1025 }],
1026 ['use_ash==1', {
1027 'defines': ['USE_ASH=1'],
1028 }],
1012 ['use_nss==1', { 1029 ['use_nss==1', {
1013 'defines': ['USE_NSS=1'], 1030 'defines': ['USE_NSS=1'],
1014 }], 1031 }],
1015 ['toolkit_uses_gtk==1', { 1032 ['toolkit_uses_gtk==1', {
1016 'defines': ['TOOLKIT_USES_GTK=1'], 1033 'defines': ['TOOLKIT_USES_GTK=1'],
1017 }], 1034 }],
1018 ['toolkit_uses_gtk==1 and toolkit_views==0', { 1035 ['toolkit_uses_gtk==1 and toolkit_views==0', {
1019 # TODO(erg): We are progressively sealing up use of deprecated features 1036 # TODO(erg): We are progressively sealing up use of deprecated features
1020 # in gtk in preparation for an eventual porting to gtk3. 1037 # in gtk in preparation for an eventual porting to gtk3.
1021 'defines': ['GTK_DISABLE_SINGLE_INCLUDES=1'], 1038 'defines': ['GTK_DISABLE_SINGLE_INCLUDES=1'],
(...skipping 1740 matching lines...) Expand 10 before | Expand all | Expand 10 after
2762 # settings in target dicts. SYMROOT is a special case, because many other 2779 # settings in target dicts. SYMROOT is a special case, because many other
2763 # Xcode variables depend on it, including variables such as 2780 # Xcode variables depend on it, including variables such as
2764 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 2781 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
2765 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 2782 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
2766 # files to appear (when present) in the UI as actual files and not red 2783 # files to appear (when present) in the UI as actual files and not red
2767 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 2784 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
2768 # and therefore SYMROOT, needs to be set at the project level. 2785 # and therefore SYMROOT, needs to be set at the project level.
2769 'SYMROOT': '<(DEPTH)/xcodebuild', 2786 'SYMROOT': '<(DEPTH)/xcodebuild',
2770 }, 2787 },
2771 } 2788 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698