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

Side by Side Diff: build/common.gypi

Issue 8528014: Remove use_only_pure_views flag (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Created 9 years, 1 month 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
« no previous file with comments | « no previous file | chrome/browser/chromeos/notifications/notification_panel.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) 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.
11 'variables': { 11 'variables': {
12 # Putting a variables dict inside another variables dict looks kind of 12 # Putting a variables dict inside another variables dict looks kind of
13 # weird. This is done so that 'host_arch', 'chromeos', etc are defined as 13 # weird. This is done so that 'host_arch', 'chromeos', etc are defined as
14 # variables within the outer variables dict here. This is necessary 14 # variables within the outer variables dict here. This is necessary
15 # to get these variables defined for the conditions within this variables 15 # to get these variables defined for the conditions within this variables
16 # dict that operate on these variables (e.g., for setting 'toolkit_views', 16 # dict that operate on these variables (e.g., for setting 'toolkit_views',
17 # we need to have 'chromeos' already set). 17 # we need to have 'chromeos' already set).
18 'variables': { 18 'variables': {
19 'variables': { 19 'variables': {
20 'variables': { 20 'variables': {
21 # Whether we're building a ChromeOS build. 21 # Whether we're building a ChromeOS build.
22 'chromeos%': 0, 22 'chromeos%': 0,
23 23
24 # Whether we are using Views Toolkit 24 # Whether we are using Views Toolkit
25 'toolkit_views%': 0, 25 'toolkit_views%': 0,
26 26
27 # Whether the Views toolkit can use its Pure form when available
28 # or if it must only use GTK (the default at the moment).
29 # This is an intermediate step until all of Views is 'Pure',
30 # at which point we plan to remove those switches.
31 # This turns on the USE_ONLY_PURE_VIEWS macro.
32 'use_only_pure_views%': 0,
33
34 # Disable touch support by default. 27 # Disable touch support by default.
35 'touchui%': 0, 28 'touchui%': 0,
36 29
37 # Whether the compositor is enabled on views. 30 # Whether the compositor is enabled on views.
38 'views_compositor%': 0, 31 'views_compositor%': 0,
39 32
40 # Whether or not we are building with the Aura window manager. 33 # Whether or not we are building with the Aura window manager.
41 'use_aura%': 0, 34 'use_aura%': 0,
42 35
43 # Use OpenSSL instead of NSS. Under development: see http://crbug.com/ 62803 36 # Use OpenSSL instead of NSS. Under development: see http://crbug.com/ 62803
44 'use_openssl%': 0, 37 'use_openssl%': 0,
45 }, 38 },
46 # Copy conditionally-set variables out one scope. 39 # Copy conditionally-set variables out one scope.
47 'chromeos%': '<(chromeos)', 40 'chromeos%': '<(chromeos)',
48 'use_only_pure_views%': '<(use_only_pure_views)',
49 'touchui%': '<(touchui)', 41 'touchui%': '<(touchui)',
50 'views_compositor%': '<(views_compositor)', 42 'views_compositor%': '<(views_compositor)',
51 'use_aura%': '<(use_aura)', 43 'use_aura%': '<(use_aura)',
52 'use_openssl%': '<(use_openssl)', 44 'use_openssl%': '<(use_openssl)',
53 45
54 # WebKit compositor for ui 46 # WebKit compositor for ui
55 'use_webkit_compositor%': 0, 47 'use_webkit_compositor%': 0,
56 48
57 # Compute the architecture that we're building on. 49 # Compute the architecture that we're building on.
58 'conditions': [ 50 'conditions': [
59 [ 'OS=="win" or OS=="mac"', { 51 [ 'OS=="win" or OS=="mac"', {
60 'host_arch%': 'ia32', 52 'host_arch%': 'ia32',
61 }, { 53 }, {
62 # This handles the Unix platforms for which there is some support. 54 # This handles the Unix platforms for which there is some support.
63 # Anything else gets passed through, which probably won't work very 55 # Anything else gets passed through, which probably won't work very
64 # well; such hosts should pass an explicit target_arch to gyp. 56 # well; such hosts should pass an explicit target_arch to gyp.
65 'host_arch%': 57 'host_arch%':
66 '<!(uname -m | sed -e "s/i.86/ia32/;s/x86_64/x64/;s/amd64/x64/;s/a rm.*/arm/;s/i86pc/ia32/")', 58 '<!(uname -m | sed -e "s/i.86/ia32/;s/x86_64/x64/;s/amd64/x64/;s/a rm.*/arm/;s/i86pc/ia32/")',
67 }], 59 }],
68 60
69 # Set default value of toolkit_views on for Windows, Chrome OS, 61 # Set default value of toolkit_views on for Windows, Chrome OS,
70 # Touch and PureView. 62 # Touch and PureView.
71 ['OS=="win" or chromeos==1 or touchui==1 or use_only_pure_views==1 or use_aura==1', { 63 ['OS=="win" or chromeos==1 or touchui==1 or use_aura==1', {
72 'toolkit_views%': 1, 64 'toolkit_views%': 1,
73 }, { 65 }, {
74 'toolkit_views%': 0, 66 'toolkit_views%': 0,
75 }], 67 }],
76 68
77 # Views are always Pure in Touch and Aura case.
78 ['touchui==1 or use_aura==1', {
79 'use_only_pure_views%': 1,
80 }, {
81 'use_only_pure_views%': 0,
82 }],
83
84 # Use virtual keyboard by default in TouchUI builds. 69 # Use virtual keyboard by default in TouchUI builds.
85 ['touchui==1', { 70 ['touchui==1', {
86 'use_virtual_keyboard%': 1, 71 'use_virtual_keyboard%': 1,
87 }, { 72 }, {
88 'use_virtual_keyboard%': 0, 73 'use_virtual_keyboard%': 0,
89 }], 74 }],
90 75
91 # Use the views compositor when using the Aura window manager or 76 # Use the views compositor when using the Aura window manager or
92 # touch. 77 # touch.
93 ['use_aura==1 or touchui==1', { 78 ['use_aura==1 or touchui==1', {
94 'views_compositor%': 1, 79 'views_compositor%': 1,
95 }], 80 }],
96 ], 81 ],
97 }, 82 },
98 83
99 # Copy conditionally-set variables out one scope. 84 # Copy conditionally-set variables out one scope.
100 'chromeos%': '<(chromeos)', 85 'chromeos%': '<(chromeos)',
101 'touchui%': '<(touchui)', 86 'touchui%': '<(touchui)',
102 'use_virtual_keyboard%': '<(use_virtual_keyboard)', 87 'use_virtual_keyboard%': '<(use_virtual_keyboard)',
103 'host_arch%': '<(host_arch)', 88 'host_arch%': '<(host_arch)',
104 'toolkit_views%': '<(toolkit_views)', 89 'toolkit_views%': '<(toolkit_views)',
105 'use_only_pure_views%': '<(use_only_pure_views)',
106 'views_compositor%': '<(views_compositor)', 90 'views_compositor%': '<(views_compositor)',
107 'use_webkit_compositor%': '<(use_webkit_compositor)', 91 'use_webkit_compositor%': '<(use_webkit_compositor)',
108 'use_aura%': '<(use_aura)', 92 'use_aura%': '<(use_aura)',
109 'use_openssl%': '<(use_openssl)', 93 'use_openssl%': '<(use_openssl)',
110 94
111 # We used to provide a variable for changing how libraries were built. 95 # We used to provide a variable for changing how libraries were built.
112 # This variable remains until we can clean up all the users. 96 # This variable remains until we can clean up all the users.
113 # This needs to be one nested variables dict in so that dependent 97 # This needs to be one nested variables dict in so that dependent
114 # gyp files can make use of it in their outer variables. (Yikes!) 98 # gyp files can make use of it in their outer variables. (Yikes!)
115 # http://code.google.com/p/chromium/issues/detail?id=83308 99 # http://code.google.com/p/chromium/issues/detail?id=83308
(...skipping 198 matching lines...) Expand 10 before | Expand all | Expand 10 after
314 }], 298 }],
315 299
316 # Enable some hacks to support Flapper only on Chrome OS. 300 # Enable some hacks to support Flapper only on Chrome OS.
317 ['chromeos==1', { 301 ['chromeos==1', {
318 'enable_flapper_hacks%': 1, 302 'enable_flapper_hacks%': 1,
319 }, { 303 }, {
320 'enable_flapper_hacks%': 0, 304 'enable_flapper_hacks%': 0,
321 }], 305 }],
322 306
323 # Enable file manager extension on Chrome OS, Touch, PureView, Aura. 307 # Enable file manager extension on Chrome OS, Touch, PureView, Aura.
324 ['chromeos==1 or touchui==1 or use_only_pure_views==1 or use_aura==1', { 308 ['chromeos==1 or touchui==1 or use_aura==1', {
325 'file_manager_extension%': 1, 309 'file_manager_extension%': 1,
326 }, { 310 }, {
327 'file_manager_extension%': 0, 311 'file_manager_extension%': 0,
328 }], 312 }],
329 313
330 # ... except on Windows even with Aura. 314 # ... except on Windows even with Aura.
331 ['use_aura==1 and OS=="win"', { 315 ['use_aura==1 and OS=="win"', {
332 'file_manager_extension%': 0, 316 'file_manager_extension%': 0,
333 }], 317 }],
334 318
335 # Enable WebUI TaskManager always on Chrome OS, Touch or PureView. 319 # Enable WebUI TaskManager always on Chrome OS, Touch or PureView.
336 ['chromeos==1 or touchui==1 or use_only_pure_views==1 or use_aura==1', { 320 ['chromeos==1 or touchui==1 or use_aura==1', {
337 'webui_task_manager%': 1, 321 'webui_task_manager%': 1,
338 }], 322 }],
339 323
340 ['OS=="android"', { 324 ['OS=="android"', {
341 'proprietary_codecs%': 1, 325 'proprietary_codecs%': 1,
342 'enable_webrtc%': 0, 326 'enable_webrtc%': 0,
343 }], 327 }],
344 328
345 # Use GPU accelerated cross process image transport by default 329 # Use GPU accelerated cross process image transport by default
346 # on TOUCH_UI and linux builds with the Aura window manager 330 # on TOUCH_UI and linux builds with the Aura window manager
347 ['views_compositor==1 and OS=="linux"', { 331 ['views_compositor==1 and OS=="linux"', {
348 'ui_compositor_image_transport%': 1, 332 'ui_compositor_image_transport%': 1,
349 }, { 333 }, {
350 'ui_compositor_image_transport%': 0, 334 'ui_compositor_image_transport%': 0,
351 }], 335 }],
352 ], 336 ],
353 }, 337 },
354 338
355 # Copy conditionally-set variables out one scope. 339 # Copy conditionally-set variables out one scope.
356 'branding%': '<(branding)', 340 'branding%': '<(branding)',
357 'buildtype%': '<(buildtype)', 341 'buildtype%': '<(buildtype)',
358 'target_arch%': '<(target_arch)', 342 'target_arch%': '<(target_arch)',
359 'host_arch%': '<(host_arch)', 343 'host_arch%': '<(host_arch)',
360 'library%': 'static_library', 344 'library%': 'static_library',
361 'toolkit_views%': '<(toolkit_views)', 345 'toolkit_views%': '<(toolkit_views)',
362 'use_only_pure_views%': '<(use_only_pure_views)',
363 'views_compositor%': '<(views_compositor)', 346 'views_compositor%': '<(views_compositor)',
364 'ui_compositor_image_transport%': '<(ui_compositor_image_transport)', 347 'ui_compositor_image_transport%': '<(ui_compositor_image_transport)',
365 'use_webkit_compositor%': '<(use_webkit_compositor)', 348 'use_webkit_compositor%': '<(use_webkit_compositor)',
366 'use_aura%': '<(use_aura)', 349 'use_aura%': '<(use_aura)',
367 'use_openssl%': '<(use_openssl)', 350 'use_openssl%': '<(use_openssl)',
368 'use_nss%': '<(use_nss)', 351 'use_nss%': '<(use_nss)',
369 'os_posix%': '<(os_posix)', 352 'os_posix%': '<(os_posix)',
370 'use_glib%': '<(use_glib)', 353 'use_glib%': '<(use_glib)',
371 'toolkit_uses_gtk%': '<(toolkit_uses_gtk)', 354 'toolkit_uses_gtk%': '<(toolkit_uses_gtk)',
372 'use_skia%': '<(use_skia)', 355 'use_skia%': '<(use_skia)',
(...skipping 439 matching lines...) Expand 10 before | Expand all | Expand 10 after
812 }, { 795 }, {
813 'grit_defines': ['-D', '_chromium', 796 'grit_defines': ['-D', '_chromium',
814 '-E', 'CHROMIUM_BUILD=chromium'], 797 '-E', 'CHROMIUM_BUILD=chromium'],
815 }], 798 }],
816 ['chromeos==1', { 799 ['chromeos==1', {
817 'grit_defines': ['-D', 'chromeos'], 800 'grit_defines': ['-D', 'chromeos'],
818 }], 801 }],
819 ['toolkit_views==1', { 802 ['toolkit_views==1', {
820 'grit_defines': ['-D', 'toolkit_views'], 803 'grit_defines': ['-D', 'toolkit_views'],
821 }], 804 }],
822 ['use_only_pure_views==1', {
823 'grit_defines': ['-D', 'use_only_pure_views'],
824 }],
825 ['use_aura==1', { 805 ['use_aura==1', {
826 'grit_defines': ['-D', 'use_aura'], 806 'grit_defines': ['-D', 'use_aura'],
827 }], 807 }],
828 ['use_nss==1', { 808 ['use_nss==1', {
829 'grit_defines': ['-D', 'use_nss'], 809 'grit_defines': ['-D', 'use_nss'],
830 }], 810 }],
831 ['touchui==1', { 811 ['touchui==1', {
832 'grit_defines': ['-D', 'touchui'], 812 'grit_defines': ['-D', 'touchui'],
833 }], 813 }],
834 ['use_virtual_keyboard==1', { 814 ['use_virtual_keyboard==1', {
(...skipping 133 matching lines...) Expand 10 before | Expand all | Expand 10 after
968 'defines': ['GOOGLE_CHROME_BUILD'], 948 'defines': ['GOOGLE_CHROME_BUILD'],
969 }, { # else: branding!="Chrome" 949 }, { # else: branding!="Chrome"
970 'defines': ['CHROMIUM_BUILD'], 950 'defines': ['CHROMIUM_BUILD'],
971 }], 951 }],
972 ['component=="shared_library"', { 952 ['component=="shared_library"', {
973 'defines': ['COMPONENT_BUILD'], 953 'defines': ['COMPONENT_BUILD'],
974 }], 954 }],
975 ['toolkit_views==1', { 955 ['toolkit_views==1', {
976 'defines': ['TOOLKIT_VIEWS=1'], 956 'defines': ['TOOLKIT_VIEWS=1'],
977 }], 957 }],
978 ['use_only_pure_views==1', {
979 'defines': ['USE_ONLY_PURE_VIEWS=1'],
980 }],
981 ['views_compositor==1', { 958 ['views_compositor==1', {
982 'defines': ['VIEWS_COMPOSITOR=1'], 959 'defines': ['VIEWS_COMPOSITOR=1'],
983 }], 960 }],
984 ['ui_compositor_image_transport==1', { 961 ['ui_compositor_image_transport==1', {
985 'defines': ['UI_COMPOSITOR_IMAGE_TRANSPORT'], 962 'defines': ['UI_COMPOSITOR_IMAGE_TRANSPORT'],
986 }], 963 }],
987 ['use_webkit_compositor==1', { 964 ['use_webkit_compositor==1', {
988 'defines': ['USE_WEBKIT_COMPOSITOR=1'], 965 'defines': ['USE_WEBKIT_COMPOSITOR=1'],
989 }], 966 }],
990 ['use_aura==1', { 967 ['use_aura==1', {
(...skipping 1633 matching lines...) Expand 10 before | Expand all | Expand 10 after
2624 # settings in target dicts. SYMROOT is a special case, because many other 2601 # settings in target dicts. SYMROOT is a special case, because many other
2625 # Xcode variables depend on it, including variables such as 2602 # Xcode variables depend on it, including variables such as
2626 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 2603 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
2627 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 2604 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
2628 # files to appear (when present) in the UI as actual files and not red 2605 # files to appear (when present) in the UI as actual files and not red
2629 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 2606 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
2630 # and therefore SYMROOT, needs to be set at the project level. 2607 # and therefore SYMROOT, needs to be set at the project level.
2631 'SYMROOT': '<(DEPTH)/xcodebuild', 2608 'SYMROOT': '<(DEPTH)/xcodebuild',
2632 }, 2609 },
2633 } 2610 }
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/chromeos/notifications/notification_panel.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698