Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(389)

Unified Diff: BUILD.gn

Issue 2026713002: Revert of [gn] Add unittests (Closed) Base URL: https://chromium.googlesource.com/v8/v8.git@master
Patch Set: Created 4 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | build_overrides/gtest.gni » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: BUILD.gn
diff --git a/BUILD.gn b/BUILD.gn
index 0e78539cfcad0c0934427835510e2ea5a1d0d877..7ed7c016ef19cf8c3b18da4b90f9e8c51dcd2d12 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -68,6 +68,15 @@
v8_random_seed = "314159265"
v8_toolset_for_shell = "host"
+
+if (v8_use_snapshot && v8_use_external_startup_data) {
+ snapshot_target = ":v8_external_snapshot"
+} else if (v8_use_snapshot) {
+ snapshot_target = ":v8_snapshot"
+} else {
+ assert(!v8_use_external_startup_data)
+ snapshot_target = ":v8_nosnapshot"
+}
###############################################################################
# Configurations
@@ -633,17 +642,6 @@
###############################################################################
# Source Sets (aka static libraries)
#
-
-source_set("v8_maybe_snapshot") {
- if (v8_use_snapshot && v8_use_external_startup_data) {
- public_deps = [ ":v8_external_snapshot" ]
- } else if (v8_use_snapshot) {
- public_deps = [ ":v8_snapshot" ]
- } else {
- assert(!v8_use_external_startup_data)
- public_deps = [ ":v8_nosnapshot" ]
- }
-}
v8_source_set("v8_nosnapshot") {
visibility = [ ":*" ] # Only targets in this file can depend on this.
@@ -2006,7 +2004,7 @@
configs = [ ":internal_config_base" ]
deps = [
- ":v8_maybe_snapshot",
+ snapshot_target,
]
public_deps = [
@@ -2048,33 +2046,6 @@
# Public targets
#
-want_v8_shell = (
- (current_toolchain == host_toolchain && v8_toolset_for_shell == "host") ||
- (current_toolchain == v8_snapshot_toolchain &&
- v8_toolset_for_shell == "host") ||
- (current_toolchain != host_toolchain && v8_toolset_for_shell == "target"))
-
-group("gn_all") {
- testonly = true
-
- deps = [
- ":d8",
- ]
-
- if (want_v8_shell) {
- deps += [
- ":v8_shell",
- ]
- }
-
- if (host_os != "mac" || !is_android) {
- # These items don't compile for Android on Mac.
- deps += [
- "test/unittests:unittests",
- ]
- }
-}
-
if (is_component_build) {
component("v8") {
sources = [
@@ -2083,7 +2054,7 @@
public_deps = [
":v8_base",
- ":v8_maybe_snapshot",
+ snapshot_target,
]
configs -= [ "//build/config/compiler:chromium_code" ]
@@ -2100,7 +2071,7 @@
group("v8") {
public_deps = [
":v8_base",
- ":v8_maybe_snapshot",
+ snapshot_target,
]
public_configs = [ ":external_config" ]
}
@@ -2147,7 +2118,10 @@
}
}
-if (want_v8_shell) {
+if ((current_toolchain == host_toolchain && v8_toolset_for_shell == "host") ||
+ (current_toolchain == v8_snapshot_toolchain &&
+ v8_toolset_for_shell == "host") ||
+ (current_toolchain != host_toolchain && v8_toolset_for_shell == "target")) {
executable("v8_shell") {
sources = [
"samples/shell.cc",
« no previous file with comments | « no previous file | build_overrides/gtest.gni » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698