177 lines
6.7 KiB
Diff
177 lines
6.7 KiB
Diff
diff --git .gn .gn
|
|
index 44a11ec90ec9b..4c35b35a97f28 100644
|
|
--- .gn
|
|
+++ .gn
|
|
@@ -158,6 +158,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 d91ef0419d702..f9b612ba8ac7a 100644
|
|
--- BUILD.gn
|
|
+++ BUILD.gn
|
|
@@ -20,6 +20,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/enterprise_companion/buildflags.gni")
|
|
import("//components/enterprise/buildflags/buildflags.gni")
|
|
import("//components/nacl/features.gni")
|
|
@@ -288,6 +289,10 @@ group("gn_all") {
|
|
|
|
deps += root_extra_deps
|
|
|
|
+ if (enable_cef) {
|
|
+ deps += [ "//cef" ]
|
|
+ }
|
|
+
|
|
if (enable_printing || enable_printing_tests) {
|
|
deps += [ "//printing:printing_unittests" ]
|
|
}
|
|
diff --git build/config/win/visual_studio_version.gni build/config/win/visual_studio_version.gni
|
|
index bd41166938952..fba7843d79796 100644
|
|
--- build/config/win/visual_studio_version.gni
|
|
+++ build/config/win/visual_studio_version.gni
|
|
@@ -5,15 +5,14 @@
|
|
declare_args() {
|
|
# Path to Visual Studio. If empty, the default is used which is to use the
|
|
# automatic toolchain in depot_tools. If set, you must also set the
|
|
- # visual_studio_version, wdk_path and windows_sdk_version.
|
|
+ # visual_studio_version, visual_studio_runtime_dirs and windows_sdk_version.
|
|
visual_studio_path = ""
|
|
|
|
# Version of Visual Studio pointed to by the visual_studio_path.
|
|
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
|
|
@@ -31,16 +30,15 @@ if (visual_studio_path == "") {
|
|
windows_sdk_version = toolchain_data.sdk_version
|
|
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(visual_studio_runtime_dirs != "",
|
|
+ "You must set the visual_studio_runtime_dirs if you set the visual " +
|
|
+ "studio path")
|
|
assert(windows_sdk_version != "",
|
|
"You must set the windows_sdk_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 = []
|
|
}
|
|
|
|
visual_studio_version_logs = [ "windows_sdk_version=${windows_sdk_version}" ]
|
|
diff --git chrome/chrome_paks.gni chrome/chrome_paks.gni
|
|
index ca413e1286916..70379761ebd59 100644
|
|
--- chrome/chrome_paks.gni
|
|
+++ chrome/chrome_paks.gni
|
|
@@ -6,6 +6,7 @@ import("//ash/ambient/resources/resources.gni")
|
|
import("//build/config/chrome_build.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("//components/compose/features.gni")
|
|
@@ -479,6 +480,10 @@ template("chrome_extra_paks") {
|
|
]
|
|
deps += [ "//extensions:extensions_resources" ]
|
|
}
|
|
+ if (enable_cef) {
|
|
+ sources += [ "$root_gen_dir/cef/cef_resources.pak" ]
|
|
+ deps += [ "//cef:cef_resources" ]
|
|
+ }
|
|
if (enable_extensions) {
|
|
sources += [ "$root_gen_dir/chrome/extensions_resources.pak" ]
|
|
deps += [ "//chrome/browser/resources/extensions:resources" ]
|
|
diff --git chrome/chrome_repack_locales.gni chrome/chrome_repack_locales.gni
|
|
index 0ec0aa2c8efb3..be510257b243c 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")
|
|
|
|
@@ -109,6 +110,10 @@ template("chrome_repack_locales") {
|
|
source_patterns += [ "${root_gen_dir}/components/strings/search_engine_descriptions_strings_" ]
|
|
deps += [ "//components/strings:search_engine_descriptions_strings" ]
|
|
}
|
|
+ if (enable_cef) {
|
|
+ source_patterns += [ "${root_gen_dir}/cef/cef_strings_" ]
|
|
+ deps += [ "//cef:cef_strings" ]
|
|
+ }
|
|
if (enable_extensions_core) {
|
|
source_patterns +=
|
|
[ "${root_gen_dir}/extensions/strings/extensions_strings_" ]
|
|
diff --git chrome/installer/mini_installer/BUILD.gn chrome/installer/mini_installer/BUILD.gn
|
|
index c490d199bf51e..4c0de0d7a0822 100644
|
|
--- chrome/installer/mini_installer/BUILD.gn
|
|
+++ chrome/installer/mini_installer/BUILD.gn
|
|
@@ -7,6 +7,7 @@ import("//build/config/features.gni")
|
|
import("//build/config/python.gni")
|
|
import("//build/config/ui.gni")
|
|
import("//build/timestamp.gni")
|
|
+import("//cef/libcef/features/features.gni")
|
|
import("//chrome/process_version_rc_template.gni")
|
|
import("//third_party/dawn/scripts/dawn_features.gni")
|
|
import("//third_party/ffmpeg/ffmpeg_options.gni")
|
|
@@ -145,11 +146,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 = [
|
|
"$root_out_dir/chrome.7z",
|
|
diff --git tools/grit/grit_args.gni tools/grit/grit_args.gni
|
|
index 79d613489bac2..869b682d453ee 100644
|
|
--- tools/grit/grit_args.gni
|
|
+++ tools/grit/grit_args.gni
|
|
@@ -5,7 +5,9 @@
|
|
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")
|
|
+import("//cef/libcef/features/features.gni")
|
|
|
|
shared_intermediate_dir = rebase_path(root_gen_dir, root_build_dir)
|
|
devtools_grd_path = "$shared_intermediate_dir/$devtools_grd_location"
|
|
@@ -36,6 +38,9 @@ _grit_defines = [
|
|
|
|
# Mac and iOS want Title Case strings.
|
|
"use_titlecase=${is_apple}",
|
|
+
|
|
+ "enable_cef=${enable_cef}",
|
|
+ "enable_pseudolocales=${enable_pseudolocales}",
|
|
]
|
|
|
|
# Must match `enable_hidpi` in ui/base/ui_features.gni.
|