Support building the chome target with enable_cef=false

This commit is contained in:
Marshall Greenblatt 2021-02-26 18:41:34 -05:00
parent 8733cb89c7
commit b5dfcd05cb
1 changed files with 31 additions and 8 deletions

View File

@ -12,17 +12,27 @@ index 0c25000917fb..cdaf3a6799c2 100644
# https://crbug.com/474506. # https://crbug.com/474506.
"//clank/java/BUILD.gn", "//clank/java/BUILD.gn",
diff --git BUILD.gn BUILD.gn diff --git BUILD.gn BUILD.gn
index 86c82ac5cf8a..e355bb940181 100644 index 86c82ac5cf8a..ea0959f631b4 100644
--- BUILD.gn --- BUILD.gn
+++ BUILD.gn +++ BUILD.gn
@@ -234,6 +234,7 @@ group("gn_all") { @@ -16,6 +16,7 @@ import("//build/config/sanitizers/sanitizers.gni")
import("//build/config/ui.gni")
if (!is_ios && !is_fuchsia) { import("//build/gn_logs.gni")
import("//build/util/generate_wrapper.gni")
+import("//cef/libcef/features/features.gni")
import("//chrome/browser/buildflags.gni")
import("//chrome/browser/media/router/features.gni")
import("//components/nacl/features.gni")
@@ -244,6 +245,9 @@ group("gn_all") {
"//third_party/angle/src/tests:angle_white_box_tests",
"//third_party/catapult/telemetry:bitmaptools($host_toolchain)",
]
+ if (enable_cef) {
+ deps += [ "//cef" ]
+ }
} else if (is_ios) {
deps += [ deps += [
+ "//cef", "//ios:all",
"//chrome/test:telemetry_perf_unittests",
"//chrome/test:unit_tests",
"//components:components_browsertests",
diff --git build/config/win/visual_studio_version.gni build/config/win/visual_studio_version.gni diff --git build/config/win/visual_studio_version.gni build/config/win/visual_studio_version.gni
index 982fbe8d3f0d..e757be4688f1 100644 index 982fbe8d3f0d..e757be4688f1 100644
--- build/config/win/visual_studio_version.gni --- build/config/win/visual_studio_version.gni
@ -55,6 +65,19 @@ index 982fbe8d3f0d..e757be4688f1 100644
+ "You must set the visual_studio_runtime_dirs if you set the visual " + + "You must set the visual_studio_runtime_dirs if you set the visual " +
+ "studio path") + "studio path")
} }
diff --git chrome/app/framework.order chrome/app/framework.order
index 839144aa1e9b..29c8ab32398a 100644
--- chrome/app/framework.order
+++ chrome/app/framework.order
@@ -28,3 +28,8 @@ _ChromeMain
_lprofDirMode
___llvm_profile_filename
___llvm_profile_raw_version
+
+# Symbols exported for CEF.
+_OBJC_CLASS_$_UnderlayOpenGLHostingWindow
+_OBJC_METACLASS_$_UnderlayOpenGLHostingWindow
+
diff --git chrome/chrome_paks.gni chrome/chrome_paks.gni diff --git chrome/chrome_paks.gni chrome/chrome_paks.gni
index 6ad9c87a3adf..33716990c792 100644 index 6ad9c87a3adf..33716990c792 100644
--- chrome/chrome_paks.gni --- chrome/chrome_paks.gni