mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2025-06-05 21:39:12 +02:00
Update to Chromium version 76.0.3809.0 (#665002)
OSR tests will be fixed by a follow-up merge of Viz support (see issue #2575).
This commit is contained in:
committed by
Marshall Greenblatt
parent
5892ffc382
commit
cc0db5f166
@ -1,24 +1,24 @@
|
||||
diff --git chrome/browser/BUILD.gn chrome/browser/BUILD.gn
|
||||
index 987b36217aad..832eab3ee56a 100644
|
||||
index 04aff03b621d..7e887b89a6d8 100644
|
||||
--- chrome/browser/BUILD.gn
|
||||
+++ chrome/browser/BUILD.gn
|
||||
@@ -8,6 +8,7 @@ import("//build/config/features.gni")
|
||||
import("//build/config/jumbo.gni")
|
||||
@@ -9,6 +9,7 @@ import("//build/config/jumbo.gni")
|
||||
import("//build/config/linux/gtk/gtk.gni")
|
||||
import("//build/config/ui.gni")
|
||||
import("//build/split_static_library.gni")
|
||||
+import("//cef/libcef/features/features.gni")
|
||||
import("//chrome/common/features.gni")
|
||||
import("//components/feature_engagement/features.gni")
|
||||
import("//components/feed/features.gni")
|
||||
@@ -1811,6 +1812,7 @@ jumbo_split_static_library("browser") {
|
||||
"//base:i18n",
|
||||
@@ -1849,6 +1850,7 @@ jumbo_split_static_library("browser") {
|
||||
"//base/allocator:buildflags",
|
||||
"//base/util/values:values_util",
|
||||
"//cc",
|
||||
+ "//cef/libcef/features",
|
||||
"//chrome:extra_resources",
|
||||
"//chrome:resources",
|
||||
"//chrome:strings",
|
||||
@@ -2111,6 +2113,10 @@ jumbo_split_static_library("browser") {
|
||||
@@ -2154,6 +2156,10 @@ jumbo_split_static_library("browser") {
|
||||
]
|
||||
}
|
||||
|
||||
@ -29,12 +29,3 @@ index 987b36217aad..832eab3ee56a 100644
|
||||
if (is_android) {
|
||||
sources += [
|
||||
"after_startup_task_utils_android.cc",
|
||||
@@ -3916,7 +3922,7 @@ jumbo_split_static_library("browser") {
|
||||
]
|
||||
}
|
||||
|
||||
- if (use_aura && !use_ozone && is_desktop_linux) {
|
||||
+ if (use_aura && !use_ozone && is_desktop_linux && use_gtk) {
|
||||
deps += [ "//chrome/browser/ui/libgtkui" ]
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user