Revert of Remove v8_toolset_for_d8 flag

Revert of Remove v8_toolset_for_d8 flag (patchset #1 id:1 of https://codereview.chromium.org/1969793002/ )

Reason for revert:
blocks roll: https://codereview.chromium.org/1975753002/

Original issue's description:
> Remove v8_toolset_for_d8 flag
>
> R=machenbach@chromium.org
> BUG=chromium:609107
>
> Committed: https://crrev.com/6cb38427984f3c31ff6c8813535cfd6ebf6058c4
> Cr-Commit-Position: refs/heads/master@{#36198}

TBR=machenbach@chromium.org,jochen@chromium.org
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=chromium:609107
Committed: https://crrev.com/b33f9a6f24edef8447adcfb028b7f1d6e291c34e
Cr-Commit-Position: refs/heads/master@{#36209}

[Michael Hablich, 2016-05-12 13:21:00]

Created Revert of Remove v8_toolset_for_d8 flag

[commit-bot: I haz the power, 2016-05-12 13:21:03]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1974773002/1
View timeline at
 https://chromium-cq-status.appspot.com/patch-timeline/1974773002/1

[commit-bot: I haz the power, 2016-05-12 13:21:11]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2016-05-12 13:21:13]

Failed to apply patch for BUILD.gn:
While running git apply --index -3 -p1;
  error: patch failed: BUILD.gn:2087
  error: repository lacks the necessary blob to fall back on 3-way merge.
  error: BUILD.gn: patch does not apply

Patch:       BUILD.gn
Index: BUILD.gn
diff --git a/BUILD.gn b/BUILD.gn
index
46fcbcf61786fe44a4324ee2870c4387d04d4037..f817a36888eab4aad5c8aec9fc6461518d9a58a1
100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -64,6 +64,7 @@
 }
 
 v8_random_seed = "314159265"
+v8_toolset_for_d8 = "host"
 v8_toolset_for_shell = "host"
 
 if (is_msan) {
@@ -2087,51 +2088,13 @@
   }
 }
 
-executable("d8") {
-  sources = [
-    "src/d8.cc",
-    "src/d8.h",
-  ]
-
-  configs -= [ "//build/config/compiler:chromium_code" ]
-  configs += [ "//build/config/compiler:no_chromium_code" ]
-  configs += [
-    # Note: don't use :internal_config here because this target will get
-    # the :external_config applied to it by virtue of depending on :v8, and
-    # you can't have both applied to the same target.
-    ":internal_config_base",
-    ":features",
-    ":toolchain",
-  ]
-
-  deps = [
-    ":d8_js2c",
-    ":v8",
-    ":v8_libplatform",
-    "//build/config/sanitizers:deps",
-    "//build/win:default_exe_manifest",
-  ]
-
-  # TODO(jochen): Add support for vtunejit.
-
-  if (is_posix) {
-    sources += [ "src/d8-posix.cc" ]
-  } else if (is_win) {
-    sources += [ "src/d8-windows.cc" ]
-  }
-
-  if (!is_component_build) {
-    sources += [ "$target_gen_dir/d8-js.cc" ]
-  }
-  if (v8_enable_i18n_support) {
-    deps += [ "//third_party/icu" ]
-  }
-}
-
-if ((current_toolchain == host_toolchain && v8_toolset_for_shell == "host") ||
(current_toolchain == snapshot_toolchain && v8_toolset_for_shell == "host") ||
(current_toolchain != host_toolchain && v8_toolset_for_shell == "target")) {
-  executable("shell") {
+if ((current_toolchain == host_toolchain && v8_toolset_for_d8 == "host") ||
+    (current_toolchain == snapshot_toolchain && v8_toolset_for_d8 == "host") ||
+    (current_toolchain != host_toolchain && v8_toolset_for_d8 == "target")) {
+  executable("d8") {
     sources = [
-      "samples/shell.cc",
+      "src/d8.cc",
+      "src/d8.h",
     ]
 
     configs -= [ "//build/config/compiler:chromium_code" ]
@@ -2146,6 +2109,48 @@
     ]
 
     deps = [
+      ":d8_js2c",
+      ":v8",
+      ":v8_libplatform",
+      "//build/config/sanitizers:deps",
+      "//build/win:default_exe_manifest",
+    ]
+
+    # TODO(jochen): Add support for vtunejit.
+
+    if (is_posix) {
+      sources += [ "src/d8-posix.cc" ]
+    } else if (is_win) {
+      sources += [ "src/d8-windows.cc" ]
+    }
+
+    if (!is_component_build) {
+      sources += [ "$target_gen_dir/d8-js.cc" ]
+    }
+    if (v8_enable_i18n_support) {
+      deps += [ "//third_party/icu" ]
+    }
+  }
+}
+
+if ((current_toolchain == host_toolchain && v8_toolset_for_shell == "host") ||
(current_toolchain == snapshot_toolchain && v8_toolset_for_shell == "host") ||
(current_toolchain != host_toolchain && v8_toolset_for_shell == "target")) {
+  executable("shell") {
+    sources = [
+      "samples/shell.cc",
+    ]
+
+    configs -= [ "//build/config/compiler:chromium_code" ]
+    configs += [ "//build/config/compiler:no_chromium_code" ]
+    configs += [
+      # Note: don't use :internal_config here because this target will get
+      # the :external_config applied to it by virtue of depending on :v8, and
+      # you can't have both applied to the same target.
+      ":internal_config_base",
+      ":features",
+      ":toolchain",
+    ]
+
+    deps = [
       ":v8",
       ":v8_libplatform",
       "//build/config/sanitizers:deps",

[Michael Hablich, 2016-05-12 13:29:00]

The CQ bit was checked by hablich@chromium.org

[commit-bot: I haz the power, 2016-05-12 13:29:04]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1974773002/80001
View timeline at
 https://chromium-cq-status.appspot.com/patch-timeline/1974773002/80001

[commit-bot: I haz the power, 2016-05-12 13:29:19]

Committed patchset #2 (id:80001)

[commit-bot: I haz the power, 2016-05-12 13:29:32]

Description was changed from

==========
Revert of Remove v8_toolset_for_d8 flag (patchset #1 id:1 of
https://codereview.chromium.org/1969793002/ )

Reason for revert:
blocks roll: https://codereview.chromium.org/1975753002/

Original issue's description:
> Remove v8_toolset_for_d8 flag
> 
> R=machenbach@chromium.org
> BUG=chromium:609107
> 
> Committed: https://crrev.com/6cb38427984f3c31ff6c8813535cfd6ebf6058c4
> Cr-Commit-Position: refs/heads/master@{#36198}

TBR=machenbach@chromium.org,jochen@chromium.org
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=chromium:609107
==========

to

==========
Revert of Remove v8_toolset_for_d8 flag (patchset #1 id:1 of
https://codereview.chromium.org/1969793002/ )

Reason for revert:
blocks roll: https://codereview.chromium.org/1975753002/

Original issue's description:
> Remove v8_toolset_for_d8 flag
>
> R=machenbach@chromium.org
> BUG=chromium:609107
>
> Committed: https://crrev.com/6cb38427984f3c31ff6c8813535cfd6ebf6058c4
> Cr-Commit-Position: refs/heads/master@{#36198}

TBR=machenbach@chromium.org,jochen@chromium.org
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=chromium:609107

Committed: https://crrev.com/b33f9a6f24edef8447adcfb028b7f1d6e291c34e
Cr-Commit-Position: refs/heads/master@{#36209}
==========

[commit-bot: I haz the power, 2016-05-12 13:29:33]

Patchset 2 (id:??) landed as
https://crrev.com/b33f9a6f24edef8447adcfb028b7f1d6e291c34e
Cr-Commit-Position: refs/heads/master@{#36209}

[jochen (gone - plz use gerrit), 2016-05-13 15:27:10]

A revert of this CL (patchset #2 id:80001) has been created in
https://codereview.chromium.org/1973363002/ by jochen@chromium.org.

The reason for reverting is: Addressed link failure.