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

Side by Side Diff: build/common.gypi

Issue 9720008: Remove defunct chromeos_gtk gyp variable. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge Created 8 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « build/all.gyp ('k') | 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) 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.
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're building pre-Aura ChromeOS (using GTK).
25 'chromeos_gtk%': 0,
26
27 # Whether we are using Views Toolkit 24 # Whether we are using Views Toolkit
28 'toolkit_views%': 0, 25 'toolkit_views%': 0,
29 26
30 # Whether or not we are using the Aura windowing framework. 27 # Whether or not we are using the Aura windowing framework.
31 'use_aura%': 0, 28 'use_aura%': 0,
32 29
33 # Whether or not we are building the Ash shell. 30 # Whether or not we are building the Ash shell.
34 'use_ash%': 0, 31 'use_ash%': 0,
35 32
36 # Use OpenSSL instead of NSS. Under development: see http://crbug.com/ 62803 33 # Use OpenSSL instead of NSS. Under development: see http://crbug.com/ 62803
37 'use_openssl%': 0, 34 'use_openssl%': 0,
38 35
39 # Disable Virtual keyboard support by default. 36 # Disable Virtual keyboard support by default.
40 'use_virtual_keyboard%': 0, 37 'use_virtual_keyboard%': 0,
41 38
42 # Disable viewport meta tag by default. 39 # Disable viewport meta tag by default.
43 'enable_viewport%': 0, 40 'enable_viewport%': 0,
44 }, 41 },
45 # Copy conditionally-set variables out one scope. 42 # Copy conditionally-set variables out one scope.
46 'chromeos%': '<(chromeos)', 43 'chromeos%': '<(chromeos)',
47 'chromeos_gtk%': '<(chromeos_gtk)',
48 'use_aura%': '<(use_aura)', 44 'use_aura%': '<(use_aura)',
49 'use_ash%': '<(use_ash)', 45 'use_ash%': '<(use_ash)',
50 'use_openssl%': '<(use_openssl)', 46 'use_openssl%': '<(use_openssl)',
51 'use_virtual_keyboard%': '<(use_virtual_keyboard)', 47 'use_virtual_keyboard%': '<(use_virtual_keyboard)',
52 'enable_viewport%': '<(enable_viewport)', 48 'enable_viewport%': '<(enable_viewport)',
53 49
54 # Compute the architecture that we're building on. 50 # Compute the architecture that we're building on.
55 'conditions': [ 51 'conditions': [
56 [ 'OS=="win" or OS=="mac"', { 52 [ 'OS=="win" or OS=="mac"', {
57 'host_arch%': 'ia32', 53 'host_arch%': 'ia32',
(...skipping 13 matching lines...) Expand all
71 67
72 # For now, Windows *AND* Linux builds that |use_aura| should also 68 # For now, Windows *AND* Linux builds that |use_aura| should also
73 # imply using ash. This rule should be removed for the future when 69 # imply using ash. This rule should be removed for the future when
74 # both Linux and Windows are using the aura windows without the ash 70 # both Linux and Windows are using the aura windows without the ash
75 # interface. 71 # interface.
76 ['use_aura==1 and ((OS=="linux" and chromeos==0) or OS=="win")', { 72 ['use_aura==1 and ((OS=="linux" and chromeos==0) or OS=="win")', {
77 'use_ash%': 1, 73 'use_ash%': 1,
78 }], 74 }],
79 75
80 # Set default value of toolkit_views based on OS. 76 # Set default value of toolkit_views based on OS.
81 ['OS=="win" or chromeos==1 or chromeos_gtk==1 or use_aura==1', { 77 ['OS=="win" or chromeos==1 or use_aura==1', {
82 'toolkit_views%': 1, 78 'toolkit_views%': 1,
83 }, { 79 }, {
84 'toolkit_views%': 0, 80 'toolkit_views%': 0,
85 }], 81 }],
86
87 # ChromeOS GTK implies ChromeOS.
88 ['chromeos_gtk==1', {
89 'chromeos%': 1,
90 }],
91 ], 82 ],
92 }, 83 },
93 84
94 # Copy conditionally-set variables out one scope. 85 # Copy conditionally-set variables out one scope.
95 'chromeos%': '<(chromeos)', 86 'chromeos%': '<(chromeos)',
96 'chromeos_gtk%': '<(chromeos_gtk)',
97 'host_arch%': '<(host_arch)', 87 'host_arch%': '<(host_arch)',
98 'toolkit_views%': '<(toolkit_views)', 88 'toolkit_views%': '<(toolkit_views)',
99 'use_aura%': '<(use_aura)', 89 'use_aura%': '<(use_aura)',
100 'use_ash%': '<(use_ash)', 90 'use_ash%': '<(use_ash)',
101 'use_openssl%': '<(use_openssl)', 91 'use_openssl%': '<(use_openssl)',
102 'use_virtual_keyboard%': '<(use_virtual_keyboard)', 92 'use_virtual_keyboard%': '<(use_virtual_keyboard)',
103 'enable_viewport%': '<(enable_viewport)', 93 'enable_viewport%': '<(enable_viewport)',
104 94
105 # 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.
106 # This variable remains until we can clean up all the users. 96 # This variable remains until we can clean up all the users.
(...skipping 348 matching lines...) Expand 10 before | Expand all | Expand 10 after
455 'os_posix%': '<(os_posix)', 445 'os_posix%': '<(os_posix)',
456 'use_glib%': '<(use_glib)', 446 'use_glib%': '<(use_glib)',
457 'toolkit_uses_gtk%': '<(toolkit_uses_gtk)', 447 'toolkit_uses_gtk%': '<(toolkit_uses_gtk)',
458 'use_skia%': '<(use_skia)', 448 'use_skia%': '<(use_skia)',
459 'use_x11%': '<(use_x11)', 449 'use_x11%': '<(use_x11)',
460 'use_gnome_keyring%': '<(use_gnome_keyring)', 450 'use_gnome_keyring%': '<(use_gnome_keyring)',
461 'linux_fpic%': '<(linux_fpic)', 451 'linux_fpic%': '<(linux_fpic)',
462 'enable_flapper_hacks%': '<(enable_flapper_hacks)', 452 'enable_flapper_hacks%': '<(enable_flapper_hacks)',
463 'enable_pepper_threading%': '<(enable_pepper_threading)', 453 'enable_pepper_threading%': '<(enable_pepper_threading)',
464 'chromeos%': '<(chromeos)', 454 'chromeos%': '<(chromeos)',
465 'chromeos_gtk%': '<(chromeos_gtk)',
466 'use_virtual_keyboard%': '<(use_virtual_keyboard)', 455 'use_virtual_keyboard%': '<(use_virtual_keyboard)',
467 'enable_viewport%': '<(enable_viewport)', 456 'enable_viewport%': '<(enable_viewport)',
468 'use_xi2_mt%':'<(use_xi2_mt)', 457 'use_xi2_mt%':'<(use_xi2_mt)',
469 'file_manager_extension%': '<(file_manager_extension)', 458 'file_manager_extension%': '<(file_manager_extension)',
470 'webui_task_manager%': '<(webui_task_manager)', 459 'webui_task_manager%': '<(webui_task_manager)',
471 'inside_chromium_build%': '<(inside_chromium_build)', 460 'inside_chromium_build%': '<(inside_chromium_build)',
472 'fastbuild%': '<(fastbuild)', 461 'fastbuild%': '<(fastbuild)',
473 'dcheck_always_on%': '<(dcheck_always_on)', 462 'dcheck_always_on%': '<(dcheck_always_on)',
474 'python_ver%': '<(python_ver)', 463 'python_ver%': '<(python_ver)',
475 'armv7%': '<(armv7)', 464 'armv7%': '<(armv7)',
(...skipping 2449 matching lines...) Expand 10 before | Expand all | Expand 10 after
2925 # settings in target dicts. SYMROOT is a special case, because many other 2914 # settings in target dicts. SYMROOT is a special case, because many other
2926 # Xcode variables depend on it, including variables such as 2915 # Xcode variables depend on it, including variables such as
2927 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 2916 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
2928 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 2917 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
2929 # files to appear (when present) in the UI as actual files and not red 2918 # files to appear (when present) in the UI as actual files and not red
2930 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 2919 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
2931 # and therefore SYMROOT, needs to be set at the project level. 2920 # and therefore SYMROOT, needs to be set at the project level.
2932 'SYMROOT': '<(DEPTH)/xcodebuild', 2921 'SYMROOT': '<(DEPTH)/xcodebuild',
2933 }, 2922 },
2934 } 2923 }
OLDNEW
« no previous file with comments | « build/all.gyp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698