2017-12-07 22:44:24 +01:00
|
|
|
diff --git chrome/browser/BUILD.gn chrome/browser/BUILD.gn
|
2020-12-02 23:31:49 +01:00
|
|
|
index 16bd4c2717ee..65e309d23866 100644
|
2017-12-07 22:44:24 +01:00
|
|
|
--- chrome/browser/BUILD.gn
|
|
|
|
+++ chrome/browser/BUILD.gn
|
2020-07-08 19:23:29 +02:00
|
|
|
@@ -12,6 +12,7 @@ import("//build/config/crypto.gni")
|
2020-06-09 19:48:00 +02:00
|
|
|
import("//build/config/features.gni")
|
2019-07-16 19:59:21 +02:00
|
|
|
import("//build/config/linux/gtk/gtk.gni")
|
2017-12-07 22:44:24 +01:00
|
|
|
import("//build/config/ui.gni")
|
|
|
|
+import("//cef/libcef/features/features.gni")
|
2020-02-10 18:10:17 +01:00
|
|
|
import("//chrome/browser/buildflags.gni")
|
2020-03-30 22:13:42 +02:00
|
|
|
import("//chrome/browser/downgrade/buildflags.gni")
|
2017-12-07 22:44:24 +01:00
|
|
|
import("//chrome/common/features.gni")
|
2020-12-02 23:31:49 +01:00
|
|
|
@@ -1912,6 +1913,7 @@ static_library("browser") {
|
2020-10-08 21:54:42 +02:00
|
|
|
"//build:chromeos_buildflags",
|
2020-12-02 23:31:49 +01:00
|
|
|
"//build/config/compiler:compiler_buildflags",
|
2017-12-07 22:44:24 +01:00
|
|
|
"//cc",
|
|
|
|
+ "//cef/libcef/features",
|
|
|
|
"//chrome:extra_resources",
|
|
|
|
"//chrome:resources",
|
|
|
|
"//chrome:strings",
|
2020-12-02 23:31:49 +01:00
|
|
|
@@ -2424,6 +2426,10 @@ static_library("browser") {
|
2018-05-16 11:28:49 +02:00
|
|
|
]
|
|
|
|
}
|
2017-12-07 22:44:24 +01:00
|
|
|
|
|
|
|
+ if (enable_cef) {
|
|
|
|
+ configs += [ "//cef/libcef/features:config" ]
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
if (is_android) {
|
|
|
|
sources += [
|
|
|
|
"after_startup_task_utils_android.cc",
|
2020-12-02 23:31:49 +01:00
|
|
|
@@ -4975,7 +4981,7 @@ static_library("browser") {
|
2020-10-08 21:54:42 +02:00
|
|
|
]
|
|
|
|
}
|
2020-08-29 00:39:23 +02:00
|
|
|
|
2020-10-08 21:54:42 +02:00
|
|
|
- if (use_ozone) {
|
|
|
|
+ if (use_ozone && !use_x11) {
|
|
|
|
sources += [
|
|
|
|
"fullscreen_ozone.cc",
|
|
|
|
"media/webrtc/window_icon_util_ozone.cc",
|