Revert of Remove enable_topchrome_md build flag (patchset #5 id:80001 of https://codereview.chromium.org/1991573002/ )
Reason for revert: Linux builder failing (isolated tests). https://build.chromium.org/p/chromium.linux/builders/Linux%20Builder%20%28dbg%29?numbuilds=100 https://build.chromium.org/p/chromium.linux/builders/Linux%20Builder%20%28dbg%29/builds/101069 Tests failed because of missing chrome_material_100_percent.pak. Original issue's description: > Remove enable_topchrome_md build flag > > Actually use of MD is still controlled by a runtime flag. > > Also get rid of Material Design resource build step (on !osx). These drop-in png replacements are no longer used (they've all been converted to vectorized images). > > BUG=none > > Committed: https://crrev.com/2b0e51237fa07b4fb9f6c20edcefce094f6cf5f5 > Cr-Commit-Position: refs/heads/master@{#395146} TBR=thestig@chromium.org,varkha@chromium.org,scottmg@chromium.org,sky@chromium.org,blundell@chromium.org,estade@chromium.org # Not skipping CQ checks because original CL landed more than 1 days ago. BUG=613980 Review-Url: https://codereview.chromium.org/2001093002 Cr-Original-Commit-Position: refs/heads/master@{#395308} Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src Cr-Mirrored-Commit: 09b5d078e074eb8a89d0b0ffcfc4b6fb1e23b727
This commit is contained in:
Родитель
298aeabfe2
Коммит
d1f258c397
18
common.gypi
18
common.gypi
|
@ -76,6 +76,9 @@
|
|||
# Enable HiDPI support.
|
||||
'enable_hidpi%': 0,
|
||||
|
||||
# Enable top chrome material design.
|
||||
'enable_topchrome_md%' : 0,
|
||||
|
||||
# Enable Wayland display server support.
|
||||
'enable_wayland_server%' : 0,
|
||||
|
||||
|
@ -162,6 +165,7 @@
|
|||
'use_openssl_certs%': '<(use_openssl_certs)',
|
||||
'enable_viewport%': '<(enable_viewport)',
|
||||
'enable_hidpi%': '<(enable_hidpi)',
|
||||
'enable_topchrome_md%': '<(enable_topchrome_md)',
|
||||
'enable_wayland_server%': '<(enable_wayland_server)',
|
||||
'enable_wifi_display%': '<(enable_wifi_display)',
|
||||
'buildtype%': '<(buildtype)',
|
||||
|
@ -248,6 +252,12 @@
|
|||
'enable_hidpi%': 1,
|
||||
}],
|
||||
|
||||
# Enable Top Chrome Material Design on Chrome OS, Windows, and Linux,
|
||||
# Mac, and *BSD.
|
||||
['chromeos==1 or OS=="win" or OS=="linux" or OS=="mac" or OS=="openbsd" or OS=="freebsd"', {
|
||||
'enable_topchrome_md%': 1,
|
||||
}],
|
||||
|
||||
# Enable App Launcher on ChromeOS only.
|
||||
['chromeos==1', {
|
||||
'enable_app_list%': 1,
|
||||
|
@ -341,6 +351,7 @@
|
|||
'use_openssl_certs%': '<(use_openssl_certs)',
|
||||
'enable_viewport%': '<(enable_viewport)',
|
||||
'enable_hidpi%': '<(enable_hidpi)',
|
||||
'enable_topchrome_md%': '<(enable_topchrome_md)',
|
||||
'enable_wayland_server%': '<(enable_wayland_server)',
|
||||
'enable_wifi_display%': '<(enable_wifi_display)',
|
||||
'android_channel%': '<(android_channel)',
|
||||
|
@ -1154,6 +1165,7 @@
|
|||
'is_cast_desktop_build%': '<(is_cast_desktop_build)',
|
||||
'enable_viewport%': '<(enable_viewport)',
|
||||
'enable_hidpi%': '<(enable_hidpi)',
|
||||
'enable_topchrome_md%': '<(enable_topchrome_md)',
|
||||
'enable_wayland_server%': '<(enable_wayland_server)',
|
||||
'enable_wifi_display%': '<(enable_wifi_display)',
|
||||
'image_loader_extension%': '<(image_loader_extension)',
|
||||
|
@ -2185,6 +2197,9 @@
|
|||
['mac_views_browser==1', {
|
||||
'grit_defines': ['-D', 'mac_views_browser'],
|
||||
}],
|
||||
['enable_topchrome_md==1', {
|
||||
'grit_defines': ['-D', 'enable_topchrome_md'],
|
||||
}],
|
||||
['enable_resource_whitelist_generation==1 and OS!="win"', {
|
||||
'grit_rc_header_format': ['-h', '#define {textual_id} _Pragma("whitelisted_resource_{numeric_id}") {numeric_id}'],
|
||||
}],
|
||||
|
@ -2748,6 +2763,9 @@
|
|||
['notifications==1', {
|
||||
'defines': ['ENABLE_NOTIFICATIONS'],
|
||||
}],
|
||||
['enable_topchrome_md==1', {
|
||||
'defines': ['ENABLE_TOPCHROME_MD=1'],
|
||||
}],
|
||||
['enable_wayland_server==1', {
|
||||
'defines': ['ENABLE_WAYLAND_SERVER=1'],
|
||||
}],
|
||||
|
|
|
@ -204,6 +204,9 @@ config("feature_flags") {
|
|||
if (enable_image_loader_extension) {
|
||||
defines += [ "IMAGE_LOADER_EXTENSION=1" ]
|
||||
}
|
||||
if (enable_topchrome_md) {
|
||||
defines += [ "ENABLE_TOPCHROME_MD=1" ]
|
||||
}
|
||||
if (enable_wayland_server) {
|
||||
defines += [ "ENABLE_WAYLAND_SERVER=1" ]
|
||||
}
|
||||
|
|
|
@ -46,6 +46,10 @@ declare_args() {
|
|||
# Whether we should use glib, a low level C utility library.
|
||||
use_glib = is_linux
|
||||
|
||||
# Indicates if material design elements in the top chrome of the browser are
|
||||
# enabled.
|
||||
enable_topchrome_md = is_chromeos || is_win || is_linux || is_mac
|
||||
|
||||
# Indicates if Wayland display server support is enabled.
|
||||
enable_wayland_server = is_chromeos
|
||||
|
||||
|
|
Загрузка…
Ссылка в новой задаче