summaryrefslogtreecommitdiffstats
path: root/chromium/build/config/win/BUILD.gn
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@qt.io>2019-05-16 09:59:13 +0200
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2019-05-20 10:28:53 +0000
commit6c11fb357ec39bf087b8b632e2b1e375aef1b38b (patch)
treec8315530db18a8ee566521c39ab8a6af4f72bc03 /chromium/build/config/win/BUILD.gn
parent3ffaed019d0772e59d6cdb2d0d32fe4834c31f72 (diff)
BASELINE: Update Chromium to 74.0.3729.159
Change-Id: I8d2497da544c275415aedd94dd25328d555de811 Reviewed-by: Michael BrĂ¼ning <michael.bruning@qt.io>
Diffstat (limited to 'chromium/build/config/win/BUILD.gn')
-rw-r--r--chromium/build/config/win/BUILD.gn38
1 files changed, 5 insertions, 33 deletions
diff --git a/chromium/build/config/win/BUILD.gn b/chromium/build/config/win/BUILD.gn
index 995638ad055..f09326af6e3 100644
--- a/chromium/build/config/win/BUILD.gn
+++ b/chromium/build/config/win/BUILD.gn
@@ -2,7 +2,6 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
-import("//build/config/c++/c++.gni")
import("//build/config/chrome_build.gni")
import("//build/config/clang/clang.gni")
import("//build/config/compiler/compiler.gni")
@@ -11,7 +10,6 @@ import("//build/config/win/visual_studio_version.gni")
import("//build/timestamp.gni")
import("//build/toolchain/goma.gni")
import("//build/toolchain/toolchain.gni")
-import("//buildtools/deps_revisions.gni")
assert(is_win)
@@ -258,32 +256,6 @@ config("runtime_library") {
defines += [ "_USING_V110_SDK71_" ]
}
- # TODO(thomasanderson): Move this into a target in //build/config/c++ and
- # deduplicate with //build/config/posix/BUILD.gn.
- if (use_custom_libcxx) {
- cflags_cc +=
- [ "-I" + rebase_path("$libcxx_prefix/include", root_build_dir) ]
- if (!is_component_build) {
- # Don't leak any symbols on a static build.
- defines += [ "_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS" ]
- }
-
- # Windows doesn't need to set _LIBCPP_ABI_VERSION since there's no system
- # C++ library we could conflict with.
- defines += [
- "CR_LIBCXX_REVISION=$libcxx_svn_revision",
- "CR_LIBCXXABI_REVISION=$libcxxabi_svn_revision",
- "_LIBCPP_ABI_UNSTABLE",
- "_LIBCPP_ENABLE_NODISCARD",
-
- # Prevent libc++ from embedding linker flags to try to automatically link
- # against its runtime library. This is unnecessary with our build system,
- # and can also result in build failures if libc++'s name for a library
- # does not match ours.
- "_LIBCPP_NO_AUTO_LINK",
- ]
- }
-
if (current_os == "winuwp") {
# When targeting Windows Runtime, certain compiler/linker flags are
# necessary.
@@ -333,7 +305,7 @@ config("runtime_library") {
# targets need to manually override it for their compiles.
config("winver") {
defines = [
- "NTDDI_VERSION=0x0A000002",
+ "NTDDI_VERSION=0x0A000003", # NTDDI_WIN10_RS2
"_WIN32_WINNT=0x0A00",
"WINVER=0x0A00",
]
@@ -447,10 +419,10 @@ config("default_crt") {
}
}
-# Use this to force the debug CRT for when building perf-critical build tools
-# that need to be fully optimized even in debug builds, for those times when the
-# debug CRT is part of the bottleneck. This also avoids *implicitly* defining
-# _DEBUG.
+# Use this to force use of the release CRT when building perf-critical build
+# tools that need to be fully optimized even in debug builds, for those times
+# when the debug CRT is part of the bottleneck. This also avoids *implicitly*
+# defining _DEBUG.
config("release_crt") {
if (is_component_build) {
cflags = [ "/MD" ]