Skip to content

Commit

Permalink
Version 2.1.0-dev.9.0
Browse files Browse the repository at this point in the history
Merge commit 'bf26f760b1bb3d5fea6bda110f6a17b590364120' into dev
Cherry-pick commit '8c20adffe66ff672111aa5ab4dbbd557df097e30' into dev
  • Loading branch information
whesse committed Nov 1, 2018
2 parents 413e0c8 + 9946af0 commit d93e5b4
Show file tree
Hide file tree
Showing 299 changed files with 28,749 additions and 1,126 deletions.
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
## 2.1.0-dev.9.0

## 2.1.0-dev.8.0

#### `dart:html`
Expand Down Expand Up @@ -150,6 +152,7 @@ a InstanceTypeError if the instance isn't of the class expected
### Core library changes
* Add `HashMap.fromEntries` and `LinkedHashmap.fromEntries` constructors.
* Add `ArgumentError.checkNotNull` utility method.
### Tool Changes
Expand Down
27 changes: 21 additions & 6 deletions DEPS
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ vars = {
"http_multi_server_tag" : "2.0.5",
"http_parser_tag" : "3.1.1",
"http_retry_tag": "0.1.1",
"http_tag" : "0.11.3+17",
"http_tag" : "0.12.0",
"http_throttle_tag" : "1.0.2",
"idl_parser_rev": "5fb1ebf49d235b5a70c9f49047e83b0654031eb7",
"intl_tag": "0.15.7",
Expand Down Expand Up @@ -144,7 +144,10 @@ vars = {
"web_socket_channel_tag": "1.0.9",
"WebCore_rev": "fb11e887f77919450e497344da570d780e078bc8",
"yaml_tag": "2.1.15",
"zlib_rev": "c3d0a6190f2f8c924a05ab6cc97b8f975bddd33f",
"zlib_rev": "c44fb7248079cc3d5563b14b3f758aee60d6b415",
"crashpad_rev": "bf327d8ceb6a669607b0dbab5a83a275d03f99ed",
"minichromium_rev": "8d641e30a8b12088649606b912c2bc4947419ccc",
"googletest_rev": "f854f1d27488996dc8a6db3c9453f80b02585e12",
}

deps = {
Expand Down Expand Up @@ -376,11 +379,23 @@ deps = {
"@" + Var("web_socket_channel_tag"),
Var("dart_root") + "/third_party/pkg/yaml":
Var("dart_git") + "yaml.git" + "@" + Var("yaml_tag"),
Var("dart_root") + "/third_party/cygwin": {
"url": Var("chromium_git") + "/chromium/deps/cygwin.git" + "@" +
}

deps_os = {
"win": {
Var("dart_root") + "/third_party/cygwin":
Var("chromium_git") + "/chromium/deps/cygwin.git" + "@" +
"c89e446b273697fadf3a10ff1007a97c0b7de6df",
"condition": "checkout_win",
},
Var("dart_root") + "/third_party/crashpad/crashpad":
Var("chromium_git") + "/crashpad/crashpad.git" + "@" +
Var("crashpad_rev"),
Var("dart_root") + "/third_party/mini_chromium/mini_chromium":
Var("chromium_git") + "/chromium/mini_chromium" + "@" +
Var("minichromium_rev"),
Var("dart_root") + "/third_party/googletest":
Var("fuchsia_git") + "/third_party/googletest" + "@" +
Var("googletest_rev"),
}
}

# TODO(iposva): Move the necessary tools so that hooks can be run
Expand Down
3 changes: 3 additions & 0 deletions build/config/BUILDCONFIG.gn
Original file line number Diff line number Diff line change
Expand Up @@ -269,6 +269,9 @@ if (is_debug) {
}
_native_compiler_configs += [ _default_optimization_config ]

# zlib's BUILD.gn expects to have this config among default configs.
_native_compiler_configs += [ "//build/config/compiler:default_optimization" ]

# Symbol setup.
_default_symbols_config = "//build/config/compiler:symbols"
_native_compiler_configs += [ _default_symbols_config ]
Expand Down
7 changes: 7 additions & 0 deletions build/config/compiler/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -748,6 +748,13 @@ config("no_optimize") {
}
}

# These are two named configs that zlib's BUILD.gn expects to exist.
config("default_optimization") {
}

config("optimize_speed") {
}

# Symbols ----------------------------------------------------------------------

config("symbols") {
Expand Down
3 changes: 0 additions & 3 deletions build/config/win/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -73,9 +73,6 @@ config("common_linker_setup") {
# exceeds maximum allowable size (80000000)
# which started happening more regularly after VS2013 Update 4.
"/maxilksize:2147483647",

# Force the creation of a .lib file for all executable() targets.
"/EXPORT:main",
]

# ASLR makes debugging with windbg difficult because Chrome.exe and
Expand Down
29 changes: 29 additions & 0 deletions build/secondary/third_party/android_tools/BUILD.gn
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
# Copyright 2018 The Dart project Authors. All rights reserved.
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.

import("//build/config/android/config.gni")

config("cpu_features_include") {
include_dirs = [ "$android_ndk_root/sources/android/cpufeatures" ]
}

config("cpu_features_warnings") {
if (is_clang) {
# cpu-features.c has few unused functions on x86 b/26403333
cflags = [ "-Wno-unused-function" ]
}
}

source_set("cpu_features") {
sources = [
"$android_ndk_root/sources/android/cpufeatures/cpu-features.c",
]
public_configs = [ ":cpu_features_include" ]
configs -= [ "//build/config/compiler:chromium_code" ]
configs += [
"//build/config/compiler:no_chromium_code",
# Must be after no_chromium_code for warning flags to be ordered correctly.
":cpu_features_warnings",
]
}
37 changes: 28 additions & 9 deletions build/toolchain/win/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,13 @@ tool_wrapper_path = rebase_path("tool_wrapper.py", root_build_dir)

# Setup the Visual Studio state.
toolchain_data = exec_script("setup_toolchain.py",
[
visual_studio_path,
windows_sdk_path,
visual_studio_runtime_dirs,
current_cpu,
],
"scope")
[
visual_studio_path,
windows_sdk_path,
visual_studio_runtime_dirs,
current_cpu,
],
"scope")

if (vc_bin_dir == "") {
vc_bin_dir = toolchain_data.vc_bin_dir
Expand Down Expand Up @@ -164,6 +164,26 @@ template("msvc_toolchain") {
rspfile_content = "{{libs}} {{solibs}} {{inputs_newline}} {{ldflags}}"
}

tool("solink_module") {
dllname = "{{output_dir}}/{{target_output_name}}{{output_extension}}" # e.g. foo.dll
pdbname = "${dllname}.pdb"
rspfile = "${dllname}.rsp"

command = "$python_path $tool_wrapper_path link-wrapper $env False link.exe /nologo /DLL /OUT:$dllname /PDB:$pdbname @$rspfile"
default_output_extension = ".dll"
default_output_dir = "{{root_out_dir}}"
description = "LINK_MODULE(DLL) {{output}}"
outputs = [
dllname,
pdbname,
]
runtime_outputs = outputs

# The use of inputs_newline is to work around a fixed per-line buffer
# size in the linker.
rspfile_content = "{{libs}} {{solibs}} {{inputs_newline}} {{ldflags}}"
}

tool("link") {
binary_output =
"{{root_out_dir}}/{{target_output_name}}{{output_extension}}"
Expand Down Expand Up @@ -194,8 +214,7 @@ template("msvc_toolchain") {
}

tool("copy") {
command =
"$python_path $tool_wrapper_path recursive-mirror {{source}} {{output}}"
command = "$python_path $tool_wrapper_path recursive-mirror {{source}} {{output}}"
description = "COPY {{source}} {{output}}"
}

Expand Down
Loading

0 comments on commit d93e5b4

Please sign in to comment.