cef/patch/patches/gn_config.patch

124 lines
4.1 KiB
Diff
Raw Normal View History

2016-06-23 19:42:00 +02:00
diff --git .gn .gn
index b6d50b724d74..f6f87492bd93 100644
2016-06-23 19:42:00 +02:00
--- .gn
+++ .gn
@@ -638,6 +638,8 @@ exec_script_whitelist =
"//chrome/android/webapk/shell_apk/prepare_upload_dir/BUILD.gn",
+ "//cef/BUILD.gn",
+
# TODO(dgn): Layer violation but breaks the build otherwise, see
# https://crbug.com/474506.
"//clank/java/BUILD.gn",
2016-06-23 19:42:00 +02:00
diff --git BUILD.gn BUILD.gn
index 97494c0a0782..da1c1eeabd85 100644
2016-06-23 19:42:00 +02:00
--- BUILD.gn
+++ BUILD.gn
@@ -223,6 +223,7 @@ group("gn_all") {
if (!is_ios && !is_fuchsia) {
2016-06-23 19:42:00 +02:00
deps += [
+ "//cef",
"//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
index 982fbe8d3f0d..e757be4688f1 100644
2016-06-23 19:42:00 +02:00
--- build/config/win/visual_studio_version.gni
+++ build/config/win/visual_studio_version.gni
@@ -12,9 +12,8 @@ declare_args() {
# Currently always "2015".
2016-06-23 19:42:00 +02:00
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 == "") {
2016-06-23 19:42:00 +02:00
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/chrome_paks.gni chrome/chrome_paks.gni
index deef406b9273..ad338636cf5d 100644
--- chrome/chrome_paks.gni
+++ chrome/chrome_paks.gni
@@ -3,6 +3,7 @@
# found in the LICENSE file.
import("//build/config/locales.gni")
+import("//cef/libcef/features/features.gni")
import("//chrome/browser/buildflags.gni")
import("//chrome/common/features.gni")
import("//chromeos/components/media_app_ui/media_app_ui.gni")
@@ -289,6 +290,7 @@ template("chrome_paks") {
}
}
+ if (!enable_cef) {
chrome_repack_locales("${target_name}_locales") {
forward_variables_from(invoker,
[
@@ -311,14 +313,17 @@ template("chrome_paks") {
output_locales = locales
}
}
+ } # !enable_cef
group(target_name) {
forward_variables_from(invoker, [ "deps" ])
public_deps = [
":${target_name}_100_percent",
":${target_name}_extra",
- ":${target_name}_locales",
]
+ if (!enable_cef) {
+ public_deps += [ ":${target_name}_locales" ]
+ }
if (enable_hidpi) {
public_deps += [ ":${target_name}_200_percent" ]
}
2016-06-23 19:42:00 +02:00
diff --git chrome/installer/mini_installer/BUILD.gn chrome/installer/mini_installer/BUILD.gn
index 056d425c4194..0c0e0f22ab66 100644
2016-06-23 19:42:00 +02:00
--- chrome/installer/mini_installer/BUILD.gn
+++ chrome/installer/mini_installer/BUILD.gn
@@ -5,6 +5,7 @@
import("//build/config/compiler/compiler.gni")
import("//build/config/features.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/icu/config.gni")
@@ -134,11 +135,13 @@ template("generate_mini_installer") {
inputs = [
"$chrome_dll_file",
"$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.