summaryrefslogtreecommitdiff
path: root/chromium/gin/BUILD.gn
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@theqtcompany.com>2016-01-25 11:39:07 +0100
committerOswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>2016-01-25 15:20:42 +0000
commit6c91641271e536ffaa88a1dff5127e42ee99a91e (patch)
tree703d9dd49602377ddc90cbf886aad37913f2496b /chromium/gin/BUILD.gn
parentb145b7fafd36f0c260d6a768c81fc14e32578099 (diff)
downloadqtwebengine-chromium-6c91641271e536ffaa88a1dff5127e42ee99a91e.tar.gz
BASELINE: Update Chromium to 49.0.2623.23
Also adds missing printing sources. Change-Id: I3726b8f0c7d6751c9fc846096c571fadca7108cd Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Diffstat (limited to 'chromium/gin/BUILD.gn')
-rw-r--r--chromium/gin/BUILD.gn39
1 files changed, 35 insertions, 4 deletions
diff --git a/chromium/gin/BUILD.gn b/chromium/gin/BUILD.gn
index 45350747bfe..4531cd1f637 100644
--- a/chromium/gin/BUILD.gn
+++ b/chromium/gin/BUILD.gn
@@ -2,7 +2,7 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
-import("//build/module_args/v8.gni")
+import("//build_overrides/v8.gni")
import("//testing/test.gni")
component("gin") {
@@ -82,21 +82,23 @@ component("gin") {
]
deps = [
"//base/third_party/dynamic_annotations",
+ "//crypto",
]
if (v8_use_external_startup_data && is_win) {
public_deps += [ ":gin_v8_snapshot_fingerprint" ]
- deps += [ "//crypto:crypto" ]
sources += [ "$target_gen_dir/v8_snapshot_fingerprint.cc" ]
defines += [ "V8_VERIFY_EXTERNAL_STARTUP_DATA" ]
}
+
+ configs += [ "//v8:external_startup_data" ]
}
if (v8_use_external_startup_data) {
action("gin_v8_snapshot_fingerprint") {
script = "//gin/fingerprint/fingerprint_v8_snapshot.py"
- snapshot_file = "$root_build_dir/snapshot_blob.bin"
- natives_file = "$root_build_dir/natives_blob.bin"
+ snapshot_file = "$root_out_dir/snapshot_blob.bin"
+ natives_file = "$root_out_dir/natives_blob.bin"
output_file = "$target_gen_dir/v8_snapshot_fingerprint.cc"
args = [
@@ -133,6 +135,8 @@ executable("gin_shell") {
"//build/config/sanitizers:deps",
"//v8",
]
+
+ configs += [ "//v8:external_startup_data" ]
}
source_set("gin_test") {
@@ -157,6 +161,8 @@ source_set("gin_test") {
deps = [
"//v8",
]
+
+ configs += [ "//v8:external_startup_data" ]
}
test("gin_unittests") {
@@ -175,8 +181,33 @@ test("gin_unittests") {
]
deps = [
+ ":gin_shell",
":gin_test",
"//base/test:test_support",
"//v8",
]
+
+ configs += [ "//v8:external_startup_data" ]
+
+ data = [
+ "modules/module_registry_unittests.js",
+ "shell/hello_world.js",
+ "test/expect.js",
+ "test/file_unittests.js",
+ "test/gtest_unittests.js",
+ "../OWNERS",
+ ]
+
+ data_deps = [
+ ":gin_shell",
+ ]
+}
+
+# TODO(GYP): Delete this after we've converted everything to GN.
+# The _run targets exist only for compatibility w/ GYP.
+group("gin_unittests_run") {
+ testonly = true
+ deps = [
+ ":gin_unittests",
+ ]
}