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

Side by Side Diff: build/common.gypi

Issue 10440037: Remove the enable_metro GYP flag, effectively making it on by default. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 7 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 | chrome/installer/mini_installer.gyp » ('j') | chrome/installer/mini_installer.gyp » ('J')
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 25 matching lines...) Expand all
36 36
37 # Disable viewport meta tag by default. 37 # Disable viewport meta tag by default.
38 'enable_viewport%': 0, 38 'enable_viewport%': 0,
39 39
40 # Enable HiDPI support. 40 # Enable HiDPI support.
41 'enable_hidpi%': 0, 41 'enable_hidpi%': 0,
42 42
43 # Enable touch optimized art assets and metrics. 43 # Enable touch optimized art assets and metrics.
44 'enable_touch_ui%': 0, 44 'enable_touch_ui%': 0,
45 45
46 # Enable inclusion of touch-optimized resources.
47 # TODO(joi): Rename to enable_touch_assets.
48 'enable_metro%': 0,
49
50 # Is this change part of the android upstream bringup? 46 # Is this change part of the android upstream bringup?
51 # Allows us to *temporarily* disable certain things for 47 # Allows us to *temporarily* disable certain things for
52 # staging. Only set to 1 in a GYP_DEFINES. 48 # staging. Only set to 1 in a GYP_DEFINES.
53 'android_upstream_bringup%': 0, 49 'android_upstream_bringup%': 0,
54 50
55 # Override buildtype to select the desired build flavor. 51 # Override buildtype to select the desired build flavor.
56 # Dev - everyday build for development/testing 52 # Dev - everyday build for development/testing
57 # Official - release build (generally implies additional processing) 53 # Official - release build (generally implies additional processing)
58 # TODO(mmoss) Once 'buildtype' is fully supported (e.g. Windows gyp 54 # TODO(mmoss) Once 'buildtype' is fully supported (e.g. Windows gyp
59 # conversion is done), some of the things which are now controlled by 55 # conversion is done), some of the things which are now controlled by
60 # 'branding', such as symbol generation, will need to be refactored 56 # 'branding', such as symbol generation, will need to be refactored
61 # based on 'buildtype' (i.e. we don't care about saving symbols for 57 # based on 'buildtype' (i.e. we don't care about saving symbols for
62 # non-Official # builds). 58 # non-Official # builds).
63 'buildtype%': 'Dev', 59 'buildtype%': 'Dev',
64 }, 60 },
65 # Copy conditionally-set variables out one scope. 61 # Copy conditionally-set variables out one scope.
66 'chromeos%': '<(chromeos)', 62 'chromeos%': '<(chromeos)',
67 'use_aura%': '<(use_aura)', 63 'use_aura%': '<(use_aura)',
68 'use_ash%': '<(use_ash)', 64 'use_ash%': '<(use_ash)',
69 'use_openssl%': '<(use_openssl)', 65 'use_openssl%': '<(use_openssl)',
70 'use_ibus%': '<(use_ibus)', 66 'use_ibus%': '<(use_ibus)',
71 'enable_viewport%': '<(enable_viewport)', 67 'enable_viewport%': '<(enable_viewport)',
72 'enable_hidpi%': '<(enable_hidpi)', 68 'enable_hidpi%': '<(enable_hidpi)',
73 'enable_touch_ui%': '<(enable_touch_ui)', 69 'enable_touch_ui%': '<(enable_touch_ui)',
74 'enable_metro%': '<(enable_metro)',
75 'android_upstream_bringup%': '<(android_upstream_bringup)', 70 'android_upstream_bringup%': '<(android_upstream_bringup)',
76 'buildtype%': '<(buildtype)', 71 'buildtype%': '<(buildtype)',
77 72
78 # Compute the architecture that we're building on. 73 # Compute the architecture that we're building on.
79 'conditions': [ 74 'conditions': [
80 [ 'OS=="win" or OS=="mac"', { 75 [ 'OS=="win" or OS=="mac"', {
81 'host_arch%': 'ia32', 76 'host_arch%': 'ia32',
82 }, { 77 }, {
83 # This handles the Unix platforms for which there is some support. 78 # This handles the Unix platforms for which there is some support.
84 # Anything else gets passed through, which probably won't work very 79 # Anything else gets passed through, which probably won't work very
(...skipping 25 matching lines...) Expand all
110 }, { 105 }, {
111 'toolkit_views%': 0, 106 'toolkit_views%': 0,
112 }], 107 }],
113 108
114 # Enable HiDPI on Mac OS. 109 # Enable HiDPI on Mac OS.
115 ['OS=="mac"', { 110 ['OS=="mac"', {
116 'enable_hidpi%': 1, 111 'enable_hidpi%': 1,
117 }], 112 }],
118 113
119 # Enable touch UI on Metro and Chrome OS. 114 # Enable touch UI on Metro and Chrome OS.
120 ['enable_metro==1 or chromeos==1', { 115 ['OS=="win" or chromeos==1', {
121 'enable_touch_ui%': 1, 116 'enable_touch_ui%': 1,
122 }], 117 }],
123 ], 118 ],
124 }, 119 },
125 120
126 # Copy conditionally-set variables out one scope. 121 # Copy conditionally-set variables out one scope.
127 'chromeos%': '<(chromeos)', 122 'chromeos%': '<(chromeos)',
128 'host_arch%': '<(host_arch)', 123 'host_arch%': '<(host_arch)',
129 'toolkit_views%': '<(toolkit_views)', 124 'toolkit_views%': '<(toolkit_views)',
130 'use_aura%': '<(use_aura)', 125 'use_aura%': '<(use_aura)',
131 'use_ash%': '<(use_ash)', 126 'use_ash%': '<(use_ash)',
132 'use_openssl%': '<(use_openssl)', 127 'use_openssl%': '<(use_openssl)',
133 'use_ibus%': '<(use_ibus)', 128 'use_ibus%': '<(use_ibus)',
134 'enable_viewport%': '<(enable_viewport)', 129 'enable_viewport%': '<(enable_viewport)',
135 'enable_hidpi%': '<(enable_hidpi)', 130 'enable_hidpi%': '<(enable_hidpi)',
136 'enable_touch_ui%': '<(enable_touch_ui)', 131 'enable_touch_ui%': '<(enable_touch_ui)',
137 'enable_metro%': '<(enable_metro)',
138 'android_upstream_bringup%': '<(android_upstream_bringup)', 132 'android_upstream_bringup%': '<(android_upstream_bringup)',
139 133
140 # We used to provide a variable for changing how libraries were built. 134 # We used to provide a variable for changing how libraries were built.
141 # This variable remains until we can clean up all the users. 135 # This variable remains until we can clean up all the users.
142 # This needs to be one nested variables dict in so that dependent 136 # This needs to be one nested variables dict in so that dependent
143 # gyp files can make use of it in their outer variables. (Yikes!) 137 # gyp files can make use of it in their outer variables. (Yikes!)
144 # http://code.google.com/p/chromium/issues/detail?id=83308 138 # http://code.google.com/p/chromium/issues/detail?id=83308
145 'library%': 'static_library', 139 'library%': 'static_library',
146 140
147 # Override branding to select the desired branding flavor. 141 # Override branding to select the desired branding flavor.
(...skipping 377 matching lines...) Expand 10 before | Expand all | Expand 10 after
525 'use_skia%': '<(use_skia)', 519 'use_skia%': '<(use_skia)',
526 'use_x11%': '<(use_x11)', 520 'use_x11%': '<(use_x11)',
527 'use_gnome_keyring%': '<(use_gnome_keyring)', 521 'use_gnome_keyring%': '<(use_gnome_keyring)',
528 'linux_fpic%': '<(linux_fpic)', 522 'linux_fpic%': '<(linux_fpic)',
529 'enable_pepper_threading%': '<(enable_pepper_threading)', 523 'enable_pepper_threading%': '<(enable_pepper_threading)',
530 'build_ppapi_ipc_proxy_untrusted%': '<(build_ppapi_ipc_proxy_untrusted)', 524 'build_ppapi_ipc_proxy_untrusted%': '<(build_ppapi_ipc_proxy_untrusted)',
531 'chromeos%': '<(chromeos)', 525 'chromeos%': '<(chromeos)',
532 'enable_viewport%': '<(enable_viewport)', 526 'enable_viewport%': '<(enable_viewport)',
533 'enable_hidpi%': '<(enable_hidpi)', 527 'enable_hidpi%': '<(enable_hidpi)',
534 'enable_touch_ui%': '<(enable_touch_ui)', 528 'enable_touch_ui%': '<(enable_touch_ui)',
535 'enable_metro%': '<(enable_metro)',
536 'use_xi2_mt%':'<(use_xi2_mt)', 529 'use_xi2_mt%':'<(use_xi2_mt)',
537 'file_manager_extension%': '<(file_manager_extension)', 530 'file_manager_extension%': '<(file_manager_extension)',
538 'webui_task_manager%': '<(webui_task_manager)', 531 'webui_task_manager%': '<(webui_task_manager)',
539 'inside_chromium_build%': '<(inside_chromium_build)', 532 'inside_chromium_build%': '<(inside_chromium_build)',
540 'fastbuild%': '<(fastbuild)', 533 'fastbuild%': '<(fastbuild)',
541 'dcheck_always_on%': '<(dcheck_always_on)', 534 'dcheck_always_on%': '<(dcheck_always_on)',
542 'python_ver%': '<(python_ver)', 535 'python_ver%': '<(python_ver)',
543 'armv7%': '<(armv7)', 536 'armv7%': '<(armv7)',
544 'arm_neon%': '<(arm_neon)', 537 'arm_neon%': '<(arm_neon)',
545 'sysroot%': '<(sysroot)', 538 'sysroot%': '<(sysroot)',
(...skipping 798 matching lines...) Expand 10 before | Expand all | Expand 10 after
1344 }], 1337 }],
1345 ['input_speech==1', { 1338 ['input_speech==1', {
1346 'defines': ['ENABLE_INPUT_SPEECH'], 1339 'defines': ['ENABLE_INPUT_SPEECH'],
1347 }], 1340 }],
1348 ['notifications==1', { 1341 ['notifications==1', {
1349 'defines': ['ENABLE_NOTIFICATIONS'], 1342 'defines': ['ENABLE_NOTIFICATIONS'],
1350 }], 1343 }],
1351 ['enable_hidpi==1', { 1344 ['enable_hidpi==1', {
1352 'defines': ['ENABLE_HIDPI=1'], 1345 'defines': ['ENABLE_HIDPI=1'],
1353 }], 1346 }],
1354 ['enable_metro==1', {
1355 'defines': ['ENABLE_METRO=1'],
1356 }],
1357 ['OS=="android" and gtest_target_type=="shared_library"', { 1347 ['OS=="android" and gtest_target_type=="shared_library"', {
1358 'defines': ['ANDROID_APK_TEST_TARGET=1'], 1348 'defines': ['ANDROID_APK_TEST_TARGET=1'],
1359 }], 1349 }],
1360 ['fastbuild!=0', { 1350 ['fastbuild!=0', {
1361 1351
1362 'conditions': [ 1352 'conditions': [
1363 # For Windows and Mac, we don't genererate debug information. 1353 # For Windows and Mac, we don't genererate debug information.
1364 ['OS=="win" or OS=="mac"', { 1354 ['OS=="win" or OS=="mac"', {
1365 'msvs_settings': { 1355 'msvs_settings': {
1366 'VCLinkerTool': { 1356 'VCLinkerTool': {
(...skipping 1751 matching lines...) Expand 10 before | Expand all | Expand 10 after
3118 # settings in target dicts. SYMROOT is a special case, because many other 3108 # settings in target dicts. SYMROOT is a special case, because many other
3119 # Xcode variables depend on it, including variables such as 3109 # Xcode variables depend on it, including variables such as
3120 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 3110 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
3121 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 3111 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
3122 # files to appear (when present) in the UI as actual files and not red 3112 # files to appear (when present) in the UI as actual files and not red
3123 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 3113 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
3124 # and therefore SYMROOT, needs to be set at the project level. 3114 # and therefore SYMROOT, needs to be set at the project level.
3125 'SYMROOT': '<(DEPTH)/xcodebuild', 3115 'SYMROOT': '<(DEPTH)/xcodebuild',
3126 }, 3116 },
3127 } 3117 }
OLDNEW
« no previous file with comments | « no previous file | chrome/installer/mini_installer.gyp » ('j') | chrome/installer/mini_installer.gyp » ('J')

Powered by Google App Engine
This is Rietveld 408576698