176 lines
6.3 KiB
Diff
176 lines
6.3 KiB
Diff
diff --git .gn .gn
|
|
index 55f5ee19f13e4..55ad3bccc3ebd 100644
|
|
--- .gn
|
|
+++ .gn
|
|
@@ -155,6 +155,8 @@ exec_script_whitelist =
|
|
"//chrome/android/webapk/shell_apk/prepare_upload_dir/BUILD.gn",
|
|
"//chrome/version.gni",
|
|
|
|
+ "//cef/BUILD.gn",
|
|
+
|
|
# TODO(dgn): Layer violation but breaks the build otherwise, see
|
|
# https://crbug.com/474506.
|
|
"//clank/java/BUILD.gn",
|
|
diff --git BUILD.gn BUILD.gn
|
|
index 710257cbb808c..fb38b7f91890c 100644
|
|
--- BUILD.gn
|
|
+++ BUILD.gn
|
|
@@ -17,6 +17,7 @@ import("//build/config/sanitizers/sanitizers.gni")
|
|
import("//build/config/ui.gni")
|
|
import("//build/gn_logs.gni")
|
|
import("//build/util/generate_wrapper.gni")
|
|
+import("//cef/libcef/features/features.gni")
|
|
import("//chrome/browser/buildflags.gni")
|
|
import("//components/nacl/features.gni")
|
|
import("//device/vr/buildflags/buildflags.gni")
|
|
@@ -114,6 +115,10 @@ group("gn_all") {
|
|
deps += [ "//third_party/abseil-cpp:absl_tests" ]
|
|
}
|
|
|
|
+ if (enable_cef) {
|
|
+ deps += [ "//cef" ]
|
|
+ }
|
|
+
|
|
if (enable_js_type_check) {
|
|
deps += [ ":webui_closure_compile" ]
|
|
}
|
|
diff --git build/config/win/visual_studio_version.gni build/config/win/visual_studio_version.gni
|
|
index d9024468296e7..11bfae65b7b02 100644
|
|
--- build/config/win/visual_studio_version.gni
|
|
+++ build/config/win/visual_studio_version.gni
|
|
@@ -12,9 +12,8 @@ declare_args() {
|
|
# Currently always "2015".
|
|
visual_studio_version = ""
|
|
|
|
- # Directory of the Windows driver kit. If visual_studio_path is empty, this
|
|
- # will be auto-filled.
|
|
- wdk_path = ""
|
|
+ # Path to Visual Studio runtime libraries.
|
|
+ visual_studio_runtime_dirs = ""
|
|
|
|
# Full path to the Windows SDK, not including a backslash at the end.
|
|
# This value is the default location, override if you have a different
|
|
@@ -28,12 +27,11 @@ if (visual_studio_path == "") {
|
|
visual_studio_path = toolchain_data.vs_path
|
|
windows_sdk_path = toolchain_data.sdk_path
|
|
visual_studio_version = toolchain_data.vs_version
|
|
- wdk_path = toolchain_data.wdk_dir
|
|
visual_studio_runtime_dirs = toolchain_data.runtime_dirs
|
|
} else {
|
|
assert(visual_studio_version != "",
|
|
"You must set the visual_studio_version if you set the path")
|
|
- assert(wdk_path != "",
|
|
- "You must set the wdk_path if you set the visual studio path")
|
|
- visual_studio_runtime_dirs = []
|
|
+ assert(visual_studio_runtime_dirs != "",
|
|
+ "You must set the visual_studio_runtime_dirs if you set the visual " +
|
|
+ "studio path")
|
|
}
|
|
diff --git chrome/app/framework.order chrome/app/framework.order
|
|
index 1d6be612da8d4..c8ea70f2f256d 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
|
|
index 1d943a762ccd8..3c659b1ca21a7 100644
|
|
--- chrome/chrome_paks.gni
|
|
+++ chrome/chrome_paks.gni
|
|
@@ -6,6 +6,7 @@ import("//ash/ambient/resources/resources.gni")
|
|
import("//build/config/chromebox_for_meetings/buildflags.gni")
|
|
import("//build/config/chromeos/ui_mode.gni")
|
|
import("//build/config/locales.gni")
|
|
+import("//cef/libcef/features/features.gni")
|
|
import("//chrome/browser/buildflags.gni")
|
|
import("//chrome/common/features.gni")
|
|
import("//extensions/buildflags/buildflags.gni")
|
|
@@ -72,6 +73,10 @@ template("chrome_repack_percent") {
|
|
"//ui/chromeos/resources",
|
|
]
|
|
}
|
|
+ if (enable_cef) {
|
|
+ sources += [ "$root_gen_dir/cef/cef_resources.pak" ]
|
|
+ deps += [ "//cef:cef_resources" ]
|
|
+ }
|
|
if (enable_extensions) {
|
|
sources += [ "$root_gen_dir/extensions/extensions_browser_resources_${percent}_percent.pak" ]
|
|
deps += [ "//extensions:extensions_browser_resources" ]
|
|
diff --git chrome/chrome_repack_locales.gni chrome/chrome_repack_locales.gni
|
|
index 4f67dd86c1f26..a0d92db77c6ce 100644
|
|
--- chrome/chrome_repack_locales.gni
|
|
+++ chrome/chrome_repack_locales.gni
|
|
@@ -6,6 +6,7 @@ import("//build/config/chrome_build.gni")
|
|
import("//build/config/chromeos/ui_mode.gni")
|
|
import("//build/config/features.gni")
|
|
import("//build/config/ui.gni")
|
|
+import("//cef/libcef/features/features.gni")
|
|
import("//extensions/buildflags/buildflags.gni")
|
|
import("//tools/grit/repack.gni")
|
|
|
|
@@ -93,6 +94,10 @@ template("chrome_repack_locales") {
|
|
[ "${root_gen_dir}/chromeos/strings/chromeos_strings_" ]
|
|
deps += [ "//chromeos/strings" ]
|
|
}
|
|
+ if (enable_cef) {
|
|
+ source_patterns += [ "${root_gen_dir}/cef/cef_strings_" ]
|
|
+ deps += [ "//cef:cef_strings" ]
|
|
+ }
|
|
if (enable_extensions) {
|
|
source_patterns +=
|
|
[ "${root_gen_dir}/extensions/strings/extensions_strings_" ]
|
|
diff --git chrome/installer/mini_installer/BUILD.gn chrome/installer/mini_installer/BUILD.gn
|
|
index 6b0c60f44dc94..bb514108fe703 100644
|
|
--- chrome/installer/mini_installer/BUILD.gn
|
|
+++ chrome/installer/mini_installer/BUILD.gn
|
|
@@ -6,6 +6,7 @@ import("//build/config/compiler/compiler.gni")
|
|
import("//build/config/features.gni")
|
|
import("//build/config/python.gni")
|
|
import("//build/config/ui.gni")
|
|
+import("//cef/libcef/features/features.gni")
|
|
import("//chrome/process_version_rc_template.gni")
|
|
import("//components/nacl/features.gni")
|
|
import("//third_party/ffmpeg/ffmpeg_options.gni")
|
|
@@ -121,11 +122,13 @@ action("mini_installer_archive") {
|
|
inputs = [
|
|
"$root_out_dir/chrome.dll",
|
|
"$root_out_dir/chrome.exe",
|
|
- "$root_out_dir/locales/en-US.pak",
|
|
"$root_out_dir/setup.exe",
|
|
"//chrome/tools/build/win/makecab.py",
|
|
release_file,
|
|
]
|
|
+ if (!enable_cef) {
|
|
+ inputs += [ "$root_out_dir/locales/en-US.pak" ]
|
|
+ }
|
|
|
|
outputs = [
|
|
# See also chrome.packed.7z conditionally added below.
|
|
diff --git tools/grit/grit_args.gni tools/grit/grit_args.gni
|
|
index a60843bab981e..44b9e98f2eb89 100644
|
|
--- tools/grit/grit_args.gni
|
|
+++ tools/grit/grit_args.gni
|
|
@@ -5,6 +5,7 @@
|
|
import("//build/config/chrome_build.gni")
|
|
import("//build/config/chromeos/ui_mode.gni")
|
|
import("//build/config/devtools.gni")
|
|
+import("//build/config/locales.gni")
|
|
import("//build/config/ui.gni")
|
|
|
|
shared_intermediate_dir = rebase_path(root_gen_dir, root_build_dir)
|
|
@@ -36,6 +37,8 @@ _grit_defines = [
|
|
|
|
# Mac and iOS want Title Case strings.
|
|
"use_titlecase=${is_apple}",
|
|
+
|
|
+ "enable_pseudolocales=${enable_pseudolocales}",
|
|
]
|
|
|
|
# Must match `enable_hidpi` in ui/base/ui_features.gni.
|