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

Issue 792903005: Revert of Revert of Revert of Add d8 target to the GN build. (Closed)

Created:
5 years, 11 months ago by Michael Achenbach
Modified:
5 years, 11 months ago
CC:
v8-dev
Base URL:
https://chromium.googlesource.com/v8/v8.git@master
Target Ref:
refs/pending/heads/master
Project:
v8
Visibility:
Public.

Description

Revert of Revert of Revert of Add d8 target to the GN build. (patchset #1 id:1 of https://codereview.chromium.org/833563004/) Reason for revert: This is now really blocking the roll (I guess). V8 was reverted because of this: http://build.chromium.org/p/chromium.win/builders/Win8%20GN%20%28dbg%29/builds/2984/ Original issue's description: > Revert of Revert of Add d8 target to the GN build. (patchset #1 id:1 of https://codereview.chromium.org/838983002/) > > Reason for revert: > Relanding because this is not actually blocking the roll. > > Original issue's description: > > Revert of Add d8 target to the GN build. (patchset #2 id:40001 of https://codereview.chromium.org/834113005/) > > > > Reason for revert: > > V8 roll fails due to this change. (see https://codereview.chromium.org/843673003/) > > > > Original issue's description: > > > Add d8 target to the GN build. > > > > > > Also formats the rest of the file with "gn format". This accounts for all the changes except for the "d8" target additions. > > > > > > Committed: https://crrev.com/36383f08c1f692ea797d54a27d7c6b3d3d53b440 > > > Cr-Commit-Position: refs/heads/master@{#25984} > > > > TBR=jochen@chromium.org,machenbach@chromium.org,brettw@chromium.org > > NOTREECHECKS=true > > NOTRY=true > > > > Committed: https://crrev.com/ef50fdfdb05e1a3a3822962f5235b804218a5f4e > > Cr-Commit-Position: refs/heads/master@{#25985} > > TBR=jochen@chromium.org,machenbach@chromium.org,brettw@chromium.org > NOTREECHECKS=true > NOTRY=true > > Committed: https://crrev.com/ebf3c34fb91b4b61f5c32383a115214c516ab5b0 > Cr-Commit-Position: refs/heads/master@{#25996} TBR=jochen@chromium.org,brettw@chromium.org,yangguo@chromium.org NOTREECHECKS=true NOTRY=true

Patch Set 1 #

Unified diffs Side-by-side diffs Delta from patch set Stats (+150 lines, -210 lines) Patch
M BUILD.gn View 22 chunks +150 lines, -210 lines 0 comments Download

Messages

Total messages: 4 (1 generated)
Michael Achenbach
Created Revert of Revert of Revert of Add d8 target to the GN build.
5 years, 11 months ago (2015-01-14 11:17:06 UTC) #1
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/patch-status/792903005/1
5 years, 11 months ago (2015-01-14 11:18:01 UTC) #2
commit-bot: I haz the power
5 years, 11 months ago (2015-01-14 11:18:06 UTC) #4
Failed to apply patch for BUILD.gn:
While running git apply --index -3 -p1;
  error: patch failed: BUILD.gn:62
  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
08723de2a8fb6631e11e91c3ff3523d27c592acd..6534eea85948104dffd43635282a3d14f370bc82
100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -22,6 +22,7 @@
 v8_target_arch = cpu_arch
 v8_random_seed = "314159265"
 
+
 ###############################################################################
 # Configurations
 #
@@ -62,34 +63,54 @@
   defines = []
 
   if (v8_enable_disassembler == true) {
-    defines += [ "ENABLE_DISASSEMBLER" ]
+    defines += [
+      "ENABLE_DISASSEMBLER",
+    ]
   }
   if (v8_enable_gdbjit == true) {
-    defines += [ "ENABLE_GDB_JIT_INTERFACE" ]
+    defines += [
+      "ENABLE_GDB_JIT_INTERFACE",
+    ]
   }
   if (v8_object_print == true) {
-    defines += [ "OBJECT_PRINT" ]
+    defines += [
+      "OBJECT_PRINT",
+    ]
   }
   if (v8_enable_verify_heap == true) {
-    defines += [ "VERIFY_HEAP" ]
+    defines += [
+      "VERIFY_HEAP",
+    ]
   }
   if (v8_interpreted_regexp == true) {
-    defines += [ "V8_INTERPRETED_REGEXP" ]
+    defines += [
+      "V8_INTERPRETED_REGEXP",
+    ]
   }
   if (v8_deprecation_warnings == true) {
-    defines += [ "V8_DEPRECATION_WARNINGS" ]
+    defines += [
+      "V8_DEPRECATION_WARNINGS",
+    ]
   }
   if (v8_enable_i18n_support == true) {
-    defines += [ "V8_I18N_SUPPORT" ]
+    defines += [
+      "V8_I18N_SUPPORT",
+    ]
   }
   if (v8_enable_extra_checks == true) {
-    defines += [ "ENABLE_EXTRA_CHECKS" ]
+    defines += [
+      "ENABLE_EXTRA_CHECKS",
+    ]
   }
   if (v8_enable_handle_zapping == true) {
-    defines += [ "ENABLE_HANDLE_ZAPPING" ]
+    defines += [
+      "ENABLE_HANDLE_ZAPPING",
+    ]
   }
   if (v8_use_external_startup_data == true) {
-    defines += [ "V8_USE_EXTERNAL_STARTUP_DATA" ]
+    defines += [
+      "V8_USE_EXTERNAL_STARTUP_DATA",
+    ]
   }
 }
 
@@ -102,16 +123,24 @@
   # TODO(jochen): Add support for arm, mips, mipsel.
 
   if (v8_target_arch == "arm64") {
-    defines += [ "V8_TARGET_ARCH_ARM64" ]
+    defines += [
+      "V8_TARGET_ARCH_ARM64",
+    ]
   }
   if (v8_target_arch == "x86") {
-    defines += [ "V8_TARGET_ARCH_IA32" ]
+    defines += [
+      "V8_TARGET_ARCH_IA32",
+    ]
   }
   if (v8_target_arch == "x64") {
-    defines += [ "V8_TARGET_ARCH_X64" ]
+    defines += [
+      "V8_TARGET_ARCH_X64",
+    ]
   }
   if (is_win) {
-    defines += [ "WIN32" ]
+    defines += [
+      "WIN32",
+    ]
     # TODO(jochen): Support v8_enable_prof.
   }
 
@@ -174,7 +203,7 @@
   ]
 
   outputs = [
-    "$target_gen_dir/libraries.cc",
+    "$target_gen_dir/libraries.cc"
   ]
 
   if (v8_enable_i18n_support) {
@@ -182,34 +211,17 @@
   }
 
   args = [
-           rebase_path("$target_gen_dir/libraries.cc", root_build_dir),
-           "CORE",
-         ] + rebase_path(sources, root_build_dir)
+    rebase_path("$target_gen_dir/libraries.cc", root_build_dir),
+    "CORE",
+  ] + rebase_path(sources, root_build_dir)
 
   if (v8_use_external_startup_data) {
     outputs += [ "$target_gen_dir/libraries.bin" ]
     args += [
       "--startup_blob",
-      rebase_path("$target_gen_dir/libraries.bin", root_build_dir),
-    ]
-  }
-}
-
-action("d8_js2c") {
-  visibility = [ ":*" ]  # Only targets in this file can depend on this.
-
-  script = "tools/js2c.py"
-
-  inputs = [
-    "src/d8.js",
-    "src/macros.py",
-  ]
-  outputs = [
-    "$target_gen_dir/d8-js.cc",
-  ]
-
-  args = rebase_path(outputs, root_build_dir) + [ "D8" ] +
-         rebase_path(inputs, root_build_dir)
+      rebase_path("$target_gen_dir/libraries.bin", root_build_dir)
+    ]
+  }
 }
 
 action("js2c_experimental") {
@@ -232,24 +244,23 @@
     "src/harmony-classes.js",
     "src/harmony-tostring.js",
     "src/harmony-templates.js",
-    "src/harmony-regexp.js",
+    "src/harmony-regexp.js"
   ]
 
   outputs = [
-    "$target_gen_dir/experimental-libraries.cc",
+    "$target_gen_dir/experimental-libraries.cc"
   ]
 
   args = [
-           rebase_path("$target_gen_dir/experimental-libraries.cc",
-                       root_build_dir),
-           "EXPERIMENTAL",
-         ] + rebase_path(sources, root_build_dir)
+    rebase_path("$target_gen_dir/experimental-libraries.cc", root_build_dir),
+    "EXPERIMENTAL",
+  ] + rebase_path(sources, root_build_dir)
 
   if (v8_use_external_startup_data) {
     outputs += [ "$target_gen_dir/libraries_experimental.bin" ]
     args += [
       "--startup_blob",
-      rebase_path("$target_gen_dir/libraries_experimental.bin",
root_build_dir),
+      rebase_path("$target_gen_dir/libraries_experimental.bin", root_build_dir)
     ]
   }
 }
@@ -260,16 +271,16 @@
 
     deps = [
       ":js2c",
-      ":js2c_experimental",
+      ":js2c_experimental"
     ]
 
     sources = [
       "$target_gen_dir/libraries.bin",
-      "$target_gen_dir/libraries_experimental.bin",
+      "$target_gen_dir/libraries_experimental.bin"
     ]
 
     outputs = [
-      "$root_out_dir/natives_blob.bin",
+      "$root_out_dir/natives_blob.bin"
     ]
 
     script = "tools/concatenate-files.py"
@@ -289,24 +300,23 @@
   ]
 
   outputs = [
-    "$target_gen_dir/debug-support.cc",
-  ]
-
-  args = rebase_path(outputs, root_build_dir) +
-         rebase_path(sources, root_build_dir)
+    "$target_gen_dir/debug-support.cc"
+  ]
+
+  args =
+    rebase_path(outputs, root_build_dir) +
+    rebase_path(sources, root_build_dir)
 }
 
 action("run_mksnapshot") {
   visibility = [ ":*" ]  # Only targets in this file can depend on this.
 
-  deps = [
-    ":mksnapshot($host_toolchain)",
-  ]
+  deps = [ ":mksnapshot($host_toolchain)" ]
 
   script = "tools/run.py"
 
   outputs = [
-    "$target_gen_dir/snapshot.cc",
+    "$target_gen_dir/snapshot.cc"
   ]
 
   args = [
@@ -314,26 +324,23 @@
                                       "root_out_dir") + "/mksnapshot",
                        root_build_dir),
     "--log-snapshot-positions",
-    "--logfile",
-    rebase_path("$target_gen_dir/snapshot.log", root_build_dir),
-    rebase_path("$target_gen_dir/snapshot.cc", root_build_dir),
+    "--logfile", rebase_path("$target_gen_dir/snapshot.log", root_build_dir),
+    rebase_path("$target_gen_dir/snapshot.cc", root_build_dir)
   ]
 
   if (v8_random_seed != "0") {
-    args += [
-      "--random-seed",
-      v8_random_seed,
-    ]
+    args += [ "--random-seed", v8_random_seed ]
   }
 
   if (v8_use_external_startup_data) {
     outputs += [ "$root_out_dir/snapshot_blob.bin" ]
     args += [
       "--startup_blob",
-      rebase_path("$root_out_dir/snapshot_blob.bin", root_build_dir),
-    ]
-  }
-}
+      rebase_path("$root_out_dir/snapshot_blob.bin", root_build_dir)
+    ]
+  }
+}
+
 
 ###############################################################################
 # Source Sets (aka static libraries)
@@ -356,11 +363,7 @@
 
   configs -= [ "//build/config/compiler:chromium_code" ]
   configs += [ "//build/config/compiler:no_chromium_code" ]
-  configs += [
-    ":internal_config",
-    ":features",
-    ":toolchain",
-  ]
+  configs += [ ":internal_config", ":features", ":toolchain" ]
 }
 
 source_set("v8_snapshot") {
@@ -381,11 +384,7 @@
 
   configs -= [ "//build/config/compiler:chromium_code" ]
   configs += [ "//build/config/compiler:no_chromium_code" ]
-  configs += [
-    ":internal_config",
-    ":features",
-    ":toolchain",
-  ]
+  configs += [ ":internal_config", ":features", ":toolchain" ]
 }
 
 if (v8_use_external_startup_data) {
@@ -407,11 +406,7 @@
 
     configs -= [ "//build/config/compiler:chromium_code" ]
     configs += [ "//build/config/compiler:no_chromium_code" ]
-    configs += [
-      ":internal_config",
-      ":features",
-      ":toolchain",
-    ]
+    configs += [ ":internal_config", ":features", ":toolchain" ]
   }
 }
 
@@ -1214,11 +1209,7 @@
 
   configs -= [ "//build/config/compiler:chromium_code" ]
   configs += [ "//build/config/compiler:no_chromium_code" ]
-  configs += [
-    ":internal_config",
-    ":features",
-    ":toolchain",
-  ]
+  configs += [ ":internal_config", ":features", ":toolchain" ]
 
   if (!is_debug) {
     configs -= [ "//build/config/compiler:optimize" ]
@@ -1226,9 +1217,7 @@
   }
 
   defines = []
-  deps = [
-    ":v8_libbase",
-  ]
+  deps = [ ":v8_libbase" ]
 
   if (is_win) {
     # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
@@ -1240,7 +1229,6 @@
     if (is_win) {
       deps += [ "//third_party/icu:icudata" ]
     }
-
     # TODO(jochen): Add support for icu_use_data_file_flag
     defines += [ "ICU_UTIL_DATA_IMPL=ICU_UTIL_DATA_FILE" ]
   } else {
@@ -1309,11 +1297,7 @@
 
   configs -= [ "//build/config/compiler:chromium_code" ]
   configs += [ "//build/config/compiler:no_chromium_code" ]
-  configs += [
-    ":internal_config_base",
-    ":features",
-    ":toolchain",
-  ]
+  configs += [ ":internal_config_base", ":features", ":toolchain" ]
 
   if (!is_debug) {
     configs -= [ "//build/config/compiler:optimize" ]
@@ -1323,11 +1307,15 @@
   defines = []
 
   if (is_posix) {
-    sources += [ "src/base/platform/platform-posix.cc" ]
+    sources += [
+      "src/base/platform/platform-posix.cc"
+    ]
   }
 
   if (is_linux) {
-    sources += [ "src/base/platform/platform-linux.cc" ]
+    sources += [
+      "src/base/platform/platform-linux.cc"
+    ]
 
     libs = [ "rt" ]
   } else if (is_android) {
@@ -1356,10 +1344,7 @@
 
     defines += [ "_CRT_RAND_S" ]  # for rand_s()
 
-    libs = [
-      "winmm.lib",
-      "ws2_32.lib",
-    ]
+    libs = [ "winmm.lib", "ws2_32.lib" ]
   }
 
   # TODO(jochen): Add support for qnx, freebsd, openbsd, netbsd, and solaris.
@@ -1378,11 +1363,7 @@
 
   configs -= [ "//build/config/compiler:chromium_code" ]
   configs += [ "//build/config/compiler:no_chromium_code" ]
-  configs += [
-    ":internal_config_ba…
(message too large)

Powered by Google App Engine
This is Rietveld 408576698