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

Side by Side Diff: build/common.gypi

Issue 2001093002: Revert of Remove enable_topchrome_md build flag (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 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
« no previous file with comments | « no previous file | build/config/BUILD.gn » ('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 58 matching lines...) Expand 10 before | Expand all | Expand 10 after
69 # verification. On other targets, this flag also enables OpenSSL for 69 # verification. On other targets, this flag also enables OpenSSL for
70 # certificate verification, but this configuration is unsupported. 70 # certificate verification, but this configuration is unsupported.
71 'use_openssl_certs%': 0, 71 'use_openssl_certs%': 0,
72 72
73 # Disable viewport meta tag by default. 73 # Disable viewport meta tag by default.
74 'enable_viewport%': 0, 74 'enable_viewport%': 0,
75 75
76 # Enable HiDPI support. 76 # Enable HiDPI support.
77 'enable_hidpi%': 0, 77 'enable_hidpi%': 0,
78 78
79 # Enable top chrome material design.
80 'enable_topchrome_md%' : 0,
81
79 # Enable Wayland display server support. 82 # Enable Wayland display server support.
80 'enable_wayland_server%' : 0, 83 'enable_wayland_server%' : 0,
81 84
82 # Enable Wi-Fi Display support. 85 # Enable Wi-Fi Display support.
83 # WARNING: This enables MPEG Transport Stream (MPEG-TS) encoding! 86 # WARNING: This enables MPEG Transport Stream (MPEG-TS) encoding!
84 'enable_wifi_display%' : 0, 87 'enable_wifi_display%' : 0,
85 88
86 # By default we build against a stable sysroot image to avoid 89 # By default we build against a stable sysroot image to avoid
87 # depending on the packages installed on the local machine. Set this 90 # depending on the packages installed on the local machine. Set this
88 # to 0 to build against locally installed headers and libraries (e.g. 91 # to 0 to build against locally installed headers and libraries (e.g.
(...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after
155 'desktop_linux%': '<(desktop_linux)', 158 'desktop_linux%': '<(desktop_linux)',
156 'use_aura%': '<(use_aura)', 159 'use_aura%': '<(use_aura)',
157 'use_ash%': '<(use_ash)', 160 'use_ash%': '<(use_ash)',
158 'use_cras%': '<(use_cras)', 161 'use_cras%': '<(use_cras)',
159 'use_ozone%': '<(use_ozone)', 162 'use_ozone%': '<(use_ozone)',
160 'embedded%': '<(embedded)', 163 'embedded%': '<(embedded)',
161 'use_libpci%': '<(use_libpci)', 164 'use_libpci%': '<(use_libpci)',
162 'use_openssl_certs%': '<(use_openssl_certs)', 165 'use_openssl_certs%': '<(use_openssl_certs)',
163 'enable_viewport%': '<(enable_viewport)', 166 'enable_viewport%': '<(enable_viewport)',
164 'enable_hidpi%': '<(enable_hidpi)', 167 'enable_hidpi%': '<(enable_hidpi)',
168 'enable_topchrome_md%': '<(enable_topchrome_md)',
165 'enable_wayland_server%': '<(enable_wayland_server)', 169 'enable_wayland_server%': '<(enable_wayland_server)',
166 'enable_wifi_display%': '<(enable_wifi_display)', 170 'enable_wifi_display%': '<(enable_wifi_display)',
167 'buildtype%': '<(buildtype)', 171 'buildtype%': '<(buildtype)',
168 'branding%': '<(branding)', 172 'branding%': '<(branding)',
169 'branding_path_component%': '<(branding)', 173 'branding_path_component%': '<(branding)',
170 'host_arch%': '<(host_arch)', 174 'host_arch%': '<(host_arch)',
171 'target_arch%': '<(target_arch)', 175 'target_arch%': '<(target_arch)',
172 'use_sysroot%': '<(use_sysroot)', 176 'use_sysroot%': '<(use_sysroot)',
173 177
174 # Set to true to instrument the code with function call logger. 178 # Set to true to instrument the code with function call logger.
(...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after
241 'is_cast_desktop_build%': 1, 245 'is_cast_desktop_build%': 1,
242 }, { 246 }, {
243 'is_cast_desktop_build%': 0, 247 'is_cast_desktop_build%': 0,
244 }], 248 }],
245 249
246 # Enable HiDPI on Mac OS, Windows and Linux (including Chrome OS). 250 # Enable HiDPI on Mac OS, Windows and Linux (including Chrome OS).
247 ['OS=="mac" or OS=="win" or OS=="linux" or OS=="openbsd" or OS=="freeb sd"', { 251 ['OS=="mac" or OS=="win" or OS=="linux" or OS=="openbsd" or OS=="freeb sd"', {
248 'enable_hidpi%': 1, 252 'enable_hidpi%': 1,
249 }], 253 }],
250 254
255 # Enable Top Chrome Material Design on Chrome OS, Windows, and Linux,
256 # Mac, and *BSD.
257 ['chromeos==1 or OS=="win" or OS=="linux" or OS=="mac" or OS=="openbsd " or OS=="freebsd"', {
258 'enable_topchrome_md%': 1,
259 }],
260
251 # Enable App Launcher on ChromeOS only. 261 # Enable App Launcher on ChromeOS only.
252 ['chromeos==1', { 262 ['chromeos==1', {
253 'enable_app_list%': 1, 263 'enable_app_list%': 1,
254 }, { 264 }, {
255 'enable_app_list%': 0, 265 'enable_app_list%': 0,
256 }], 266 }],
257 267
258 ['use_aura==1 and OS!="android"', { 268 ['use_aura==1 and OS!="android"', {
259 'use_default_render_theme%': 1, 269 'use_default_render_theme%': 1,
260 }, { 270 }, {
(...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after
334 'use_ash%': '<(use_ash)', 344 'use_ash%': '<(use_ash)',
335 'use_cras%': '<(use_cras)', 345 'use_cras%': '<(use_cras)',
336 'use_libpci%': '<(use_libpci)', 346 'use_libpci%': '<(use_libpci)',
337 'use_ozone%': '<(use_ozone)', 347 'use_ozone%': '<(use_ozone)',
338 'use_ozone_evdev%': '<(use_ozone_evdev)', 348 'use_ozone_evdev%': '<(use_ozone_evdev)',
339 'use_clipboard_aurax11%': '<(use_clipboard_aurax11)', 349 'use_clipboard_aurax11%': '<(use_clipboard_aurax11)',
340 'embedded%': '<(embedded)', 350 'embedded%': '<(embedded)',
341 'use_openssl_certs%': '<(use_openssl_certs)', 351 'use_openssl_certs%': '<(use_openssl_certs)',
342 'enable_viewport%': '<(enable_viewport)', 352 'enable_viewport%': '<(enable_viewport)',
343 'enable_hidpi%': '<(enable_hidpi)', 353 'enable_hidpi%': '<(enable_hidpi)',
354 'enable_topchrome_md%': '<(enable_topchrome_md)',
344 'enable_wayland_server%': '<(enable_wayland_server)', 355 'enable_wayland_server%': '<(enable_wayland_server)',
345 'enable_wifi_display%': '<(enable_wifi_display)', 356 'enable_wifi_display%': '<(enable_wifi_display)',
346 'android_channel%': '<(android_channel)', 357 'android_channel%': '<(android_channel)',
347 'use_goma%': '<(use_goma)', 358 'use_goma%': '<(use_goma)',
348 'gomadir%': '<(gomadir)', 359 'gomadir%': '<(gomadir)',
349 'enable_app_list%': '<(enable_app_list)', 360 'enable_app_list%': '<(enable_app_list)',
350 'use_default_render_theme%': '<(use_default_render_theme)', 361 'use_default_render_theme%': '<(use_default_render_theme)',
351 'buildtype%': '<(buildtype)', 362 'buildtype%': '<(buildtype)',
352 'branding%': '<(branding)', 363 'branding%': '<(branding)',
353 'branding_path_component%': '<(branding_path_component)', 364 'branding_path_component%': '<(branding_path_component)',
(...skipping 793 matching lines...) Expand 10 before | Expand all | Expand 10 after
1147 'use_clipboard_aurax11%': '<(use_clipboard_aurax11)', 1158 'use_clipboard_aurax11%': '<(use_clipboard_aurax11)',
1148 'desktop_linux%': '<(desktop_linux)', 1159 'desktop_linux%': '<(desktop_linux)',
1149 'use_x11%': '<(use_x11)', 1160 'use_x11%': '<(use_x11)',
1150 'use_gnome_keyring%': '<(use_gnome_keyring)', 1161 'use_gnome_keyring%': '<(use_gnome_keyring)',
1151 'linux_fpic%': '<(linux_fpic)', 1162 'linux_fpic%': '<(linux_fpic)',
1152 'chromeos%': '<(chromeos)', 1163 'chromeos%': '<(chromeos)',
1153 'chromecast%': '<(chromecast)', 1164 'chromecast%': '<(chromecast)',
1154 'is_cast_desktop_build%': '<(is_cast_desktop_build)', 1165 'is_cast_desktop_build%': '<(is_cast_desktop_build)',
1155 'enable_viewport%': '<(enable_viewport)', 1166 'enable_viewport%': '<(enable_viewport)',
1156 'enable_hidpi%': '<(enable_hidpi)', 1167 'enable_hidpi%': '<(enable_hidpi)',
1168 'enable_topchrome_md%': '<(enable_topchrome_md)',
1157 'enable_wayland_server%': '<(enable_wayland_server)', 1169 'enable_wayland_server%': '<(enable_wayland_server)',
1158 'enable_wifi_display%': '<(enable_wifi_display)', 1170 'enable_wifi_display%': '<(enable_wifi_display)',
1159 'image_loader_extension%': '<(image_loader_extension)', 1171 'image_loader_extension%': '<(image_loader_extension)',
1160 'fastbuild%': '<(fastbuild)', 1172 'fastbuild%': '<(fastbuild)',
1161 'win_z7%': '<(win_z7)', 1173 'win_z7%': '<(win_z7)',
1162 'dcheck_always_on%': '<(dcheck_always_on)', 1174 'dcheck_always_on%': '<(dcheck_always_on)',
1163 'tracing_like_official_build%': '<(tracing_like_official_build)', 1175 'tracing_like_official_build%': '<(tracing_like_official_build)',
1164 'fieldtrial_testing_like_official_build%': '<(fieldtrial_testing_like_offici al_build)', 1176 'fieldtrial_testing_like_official_build%': '<(fieldtrial_testing_like_offici al_build)',
1165 'arm_version%': '<(arm_version)', 1177 'arm_version%': '<(arm_version)',
1166 'arm_neon%': '<(arm_neon)', 1178 'arm_neon%': '<(arm_neon)',
(...skipping 1012 matching lines...) Expand 10 before | Expand all | Expand 10 after
2179 }], 2191 }],
2180 ['enable_task_manager==1', { 2192 ['enable_task_manager==1', {
2181 'grit_defines': ['-D', 'enable_task_manager'], 2193 'grit_defines': ['-D', 'enable_task_manager'],
2182 }], 2194 }],
2183 ['notifications==1', { 2195 ['notifications==1', {
2184 'grit_defines': ['-D', 'enable_notifications'], 2196 'grit_defines': ['-D', 'enable_notifications'],
2185 }], 2197 }],
2186 ['mac_views_browser==1', { 2198 ['mac_views_browser==1', {
2187 'grit_defines': ['-D', 'mac_views_browser'], 2199 'grit_defines': ['-D', 'mac_views_browser'],
2188 }], 2200 }],
2201 ['enable_topchrome_md==1', {
2202 'grit_defines': ['-D', 'enable_topchrome_md'],
2203 }],
2189 ['enable_resource_whitelist_generation==1 and OS!="win"', { 2204 ['enable_resource_whitelist_generation==1 and OS!="win"', {
2190 'grit_rc_header_format': ['-h', '#define {textual_id} _Pragma("whitelist ed_resource_{numeric_id}") {numeric_id}'], 2205 'grit_rc_header_format': ['-h', '#define {textual_id} _Pragma("whitelist ed_resource_{numeric_id}") {numeric_id}'],
2191 }], 2206 }],
2192 ['enable_resource_whitelist_generation==1 and OS=="win"', { 2207 ['enable_resource_whitelist_generation==1 and OS=="win"', {
2193 'grit_rc_header_format': ['-h', '#define {textual_id} __pragma(message(" whitelisted_resource_{numeric_id}")) {numeric_id}'], 2208 'grit_rc_header_format': ['-h', '#define {textual_id} __pragma(message(" whitelisted_resource_{numeric_id}")) {numeric_id}'],
2194 }], 2209 }],
2195 ['enable_mdns==1 or OS=="mac"', { 2210 ['enable_mdns==1 or OS=="mac"', {
2196 'grit_defines': ['-D', 'enable_service_discovery'], 2211 'grit_defines': ['-D', 'enable_service_discovery'],
2197 'enable_service_discovery%': 1 2212 'enable_service_discovery%': 1
2198 }], 2213 }],
(...skipping 543 matching lines...) Expand 10 before | Expand all | Expand 10 after
2742 }], 2757 }],
2743 ['enable_pepper_cdms==1', { 2758 ['enable_pepper_cdms==1', {
2744 'defines': ['ENABLE_PEPPER_CDMS'], 2759 'defines': ['ENABLE_PEPPER_CDMS'],
2745 }], 2760 }],
2746 ['enable_browser_cdms==1', { 2761 ['enable_browser_cdms==1', {
2747 'defines': ['ENABLE_BROWSER_CDMS'], 2762 'defines': ['ENABLE_BROWSER_CDMS'],
2748 }], 2763 }],
2749 ['notifications==1', { 2764 ['notifications==1', {
2750 'defines': ['ENABLE_NOTIFICATIONS'], 2765 'defines': ['ENABLE_NOTIFICATIONS'],
2751 }], 2766 }],
2767 ['enable_topchrome_md==1', {
2768 'defines': ['ENABLE_TOPCHROME_MD=1'],
2769 }],
2752 ['enable_wayland_server==1', { 2770 ['enable_wayland_server==1', {
2753 'defines': ['ENABLE_WAYLAND_SERVER=1'], 2771 'defines': ['ENABLE_WAYLAND_SERVER=1'],
2754 }], 2772 }],
2755 ['enable_wifi_display==1', { 2773 ['enable_wifi_display==1', {
2756 'defines': ['ENABLE_WIFI_DISPLAY=1'], 2774 'defines': ['ENABLE_WIFI_DISPLAY=1'],
2757 }], 2775 }],
2758 ['use_udev==1', { 2776 ['use_udev==1', {
2759 'defines': ['USE_UDEV'], 2777 'defines': ['USE_UDEV'],
2760 }], 2778 }],
2761 ['fastbuild!=0', { 2779 ['fastbuild!=0', {
(...skipping 3532 matching lines...) Expand 10 before | Expand all | Expand 10 after
6294 # settings in target dicts. SYMROOT is a special case, because many other 6312 # settings in target dicts. SYMROOT is a special case, because many other
6295 # Xcode variables depend on it, including variables such as 6313 # Xcode variables depend on it, including variables such as
6296 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 6314 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
6297 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 6315 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
6298 # files to appear (when present) in the UI as actual files and not red 6316 # files to appear (when present) in the UI as actual files and not red
6299 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 6317 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
6300 # and therefore SYMROOT, needs to be set at the project level. 6318 # and therefore SYMROOT, needs to be set at the project level.
6301 'SYMROOT': '<(DEPTH)/xcodebuild', 6319 'SYMROOT': '<(DEPTH)/xcodebuild',
6302 }, 6320 },
6303 } 6321 }
OLDNEW
« no previous file with comments | « no previous file | build/config/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698