AuroraMiddleware/v8
1
0
Fork 0
Code Issues 2 Pull Requests Releases Wiki Activity

Revert of Run "gn format" on v8's BUILD.gn file. (patchset #1 id:1 of https://codereview.chromium.org/787873003/)

Browse Source 
Reason for revert:
Need to revert in order to revert
https://codereview.chromium.org/832413005/

Original issue's description:
> Run "gn format" on v8's BUILD.gn file.
>
> There should be no functional change.
>
> This is a reland of a portion of https://codereview.chromium.org/834113005/
>
> Committed: https://crrev.com/e1d957268d154e7fb7abd5a6cad54f602badc9b8
> Cr-Commit-Position: refs/heads/master@{#25986}

TBR=jochen@chromium.org,brettw@chromium.org
NOTREECHECKS=true
NOTRY=true

Review URL: https://codereview.chromium.org/793613003

Cr-Commit-Position: refs/heads/master@{#25990}
This commit is contained in:
machenbach 2015-01-08 02:48:04 -08:00 committed by Commit bot
parent 2050994d80
commit 6c6233c1e7
1 changed files with 138 additions and 145 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

283
BUILD.gn
View File

@ -17,13 +17,13 @@ v8_enable_verify_heap = false
v8_interpreted_regexp = false v8_interpreted_regexp = false
v8_object_print = false v8_object_print = false
v8_postmortem_support = false v8_postmortem_support = false
# TODO(eseidel): The snapshot generated by the GN Android build crashes. # TODO(eseidel): The snapshot generated by the GN Android build crashes.
v8_use_snapshot = !is_android v8_use_snapshot = !is_android
v8_enable_extra_checks = is_debug v8_enable_extra_checks = is_debug
v8_target_arch = cpu_arch v8_target_arch = cpu_arch
v8_random_seed = "314159265" v8_random_seed = "314159265"
############################################################################### ###############################################################################
# Configurations # Configurations
# #
@ -64,34 +64,54 @@ config("features") {
defines = [] defines = []
if (v8_enable_disassembler == true) { if (v8_enable_disassembler == true) {
defines += [ "ENABLE_DISASSEMBLER" ] defines += [
"ENABLE_DISASSEMBLER",
]
} }
if (v8_enable_gdbjit == true) { if (v8_enable_gdbjit == true) {
defines += [ "ENABLE_GDB_JIT_INTERFACE" ] defines += [
"ENABLE_GDB_JIT_INTERFACE",
]
} }
if (v8_object_print == true) { if (v8_object_print == true) {
defines += [ "OBJECT_PRINT" ] defines += [
"OBJECT_PRINT",
]
} }
if (v8_enable_verify_heap == true) { if (v8_enable_verify_heap == true) {
defines += [ "VERIFY_HEAP" ] defines += [
"VERIFY_HEAP",
]
} }
if (v8_interpreted_regexp == true) { if (v8_interpreted_regexp == true) {
defines += [ "V8_INTERPRETED_REGEXP" ] defines += [
"V8_INTERPRETED_REGEXP",
]
} }
if (v8_deprecation_warnings == true) { if (v8_deprecation_warnings == true) {
defines += [ "V8_DEPRECATION_WARNINGS" ] defines += [
"V8_DEPRECATION_WARNINGS",
]
} }
if (v8_enable_i18n_support == true) { if (v8_enable_i18n_support == true) {
defines += [ "V8_I18N_SUPPORT" ] defines += [
"V8_I18N_SUPPORT",
]
} }
if (v8_enable_extra_checks == true) { if (v8_enable_extra_checks == true) {
defines += [ "ENABLE_EXTRA_CHECKS" ] defines += [
"ENABLE_EXTRA_CHECKS",
]
} }
if (v8_enable_handle_zapping == true) { if (v8_enable_handle_zapping == true) {
defines += [ "ENABLE_HANDLE_ZAPPING" ] defines += [
"ENABLE_HANDLE_ZAPPING",
]
} }
if (v8_use_external_startup_data == true) { if (v8_use_external_startup_data == true) {
defines += [ "V8_USE_EXTERNAL_STARTUP_DATA" ] defines += [
"V8_USE_EXTERNAL_STARTUP_DATA",
]
} }
} }
@ -104,16 +124,24 @@ config("toolchain") {
# TODO(jochen): Add support for arm, mips, mipsel. # TODO(jochen): Add support for arm, mips, mipsel.
if (v8_target_arch == "arm64") { if (v8_target_arch == "arm64") {
defines += [ "V8_TARGET_ARCH_ARM64" ] defines += [
"V8_TARGET_ARCH_ARM64",
]
} }
if (v8_target_arch == "x86") { if (v8_target_arch == "x86") {
defines += [ "V8_TARGET_ARCH_IA32" ] defines += [
"V8_TARGET_ARCH_IA32",
]
} }
if (v8_target_arch == "x64") { if (v8_target_arch == "x64") {
defines += [ "V8_TARGET_ARCH_X64" ] defines += [
"V8_TARGET_ARCH_X64",
]
} }
if (is_win) { if (is_win) {
defines += [ "WIN32" ] defines += [
"WIN32",
]
# TODO(jochen): Support v8_enable_prof. # TODO(jochen): Support v8_enable_prof.
} }
@ -176,7 +204,7 @@ action("js2c") {
] ]
outputs = [ outputs = [
"$target_gen_dir/libraries.cc", "$target_gen_dir/libraries.cc"
] ]
if (v8_enable_i18n_support) { if (v8_enable_i18n_support) {
@ -184,15 +212,15 @@ action("js2c") {
} }
args = [ args = [
rebase_path("$target_gen_dir/libraries.cc", root_build_dir), rebase_path("$target_gen_dir/libraries.cc", root_build_dir),
"CORE", "CORE",
] + rebase_path(sources, root_build_dir) ] + rebase_path(sources, root_build_dir)
if (v8_use_external_startup_data) { if (v8_use_external_startup_data) {
outputs += [ "$target_gen_dir/libraries.bin" ] outputs += [ "$target_gen_dir/libraries.bin" ]
args += [ args += [
"--startup_blob", "--startup_blob",
rebase_path("$target_gen_dir/libraries.bin", root_build_dir), rebase_path("$target_gen_dir/libraries.bin", root_build_dir)
] ]
} }
} }
@ -217,24 +245,23 @@ action("js2c_experimental") {
"src/harmony-classes.js", "src/harmony-classes.js",
"src/harmony-tostring.js", "src/harmony-tostring.js",
"src/harmony-templates.js", "src/harmony-templates.js",
"src/harmony-regexp.js", "src/harmony-regexp.js"
] ]
outputs = [ outputs = [
"$target_gen_dir/experimental-libraries.cc", "$target_gen_dir/experimental-libraries.cc"
] ]
args = [ args = [
rebase_path("$target_gen_dir/experimental-libraries.cc", rebase_path("$target_gen_dir/experimental-libraries.cc", root_build_dir),
root_build_dir), "EXPERIMENTAL",
"EXPERIMENTAL", ] + rebase_path(sources, root_build_dir)
] + rebase_path(sources, root_build_dir)
if (v8_use_external_startup_data) { if (v8_use_external_startup_data) {
outputs += [ "$target_gen_dir/libraries_experimental.bin" ] outputs += [ "$target_gen_dir/libraries_experimental.bin" ]
args += [ args += [
"--startup_blob", "--startup_blob",
rebase_path("$target_gen_dir/libraries_experimental.bin", root_build_dir), rebase_path("$target_gen_dir/libraries_experimental.bin", root_build_dir)
] ]
} }
} }
@ -245,16 +272,16 @@ if (v8_use_external_startup_data) {
deps = [ deps = [
":js2c", ":js2c",
":js2c_experimental", ":js2c_experimental"
] ]
sources = [ sources = [
"$target_gen_dir/libraries.bin", "$target_gen_dir/libraries.bin",
"$target_gen_dir/libraries_experimental.bin", "$target_gen_dir/libraries_experimental.bin"
] ]
outputs = [ outputs = [
"$root_out_dir/natives_blob.bin", "$root_out_dir/natives_blob.bin"
] ]
script = "tools/concatenate-files.py" script = "tools/concatenate-files.py"
@ -274,24 +301,23 @@ action("postmortem-metadata") {
] ]
outputs = [ outputs = [
"$target_gen_dir/debug-support.cc", "$target_gen_dir/debug-support.cc"
] ]
args = rebase_path(outputs, root_build_dir) + args =
rebase_path(sources, root_build_dir) rebase_path(outputs, root_build_dir) +
rebase_path(sources, root_build_dir)
} }
action("run_mksnapshot") { action("run_mksnapshot") {
visibility = [ ":*" ] # Only targets in this file can depend on this. visibility = [ ":*" ] # Only targets in this file can depend on this.
deps = [ deps = [ ":mksnapshot($host_toolchain)" ]
":mksnapshot($host_toolchain)",
]
script = "tools/run.py" script = "tools/run.py"
outputs = [ outputs = [
"$target_gen_dir/snapshot.cc", "$target_gen_dir/snapshot.cc"
] ]
args = [ args = [
@ -299,27 +325,24 @@ action("run_mksnapshot") {
"root_out_dir") + "/mksnapshot", "root_out_dir") + "/mksnapshot",
root_build_dir), root_build_dir),
"--log-snapshot-positions", "--log-snapshot-positions",
"--logfile", "--logfile", rebase_path("$target_gen_dir/snapshot.log", root_build_dir),
rebase_path("$target_gen_dir/snapshot.log", root_build_dir), rebase_path("$target_gen_dir/snapshot.cc", root_build_dir)
rebase_path("$target_gen_dir/snapshot.cc", root_build_dir),
] ]
if (v8_random_seed != "0") { if (v8_random_seed != "0") {
args += [ args += [ "--random-seed", v8_random_seed ]
"--random-seed",
v8_random_seed,
]
} }
if (v8_use_external_startup_data) { if (v8_use_external_startup_data) {
outputs += [ "$root_out_dir/snapshot_blob.bin" ] outputs += [ "$root_out_dir/snapshot_blob.bin" ]
args += [ args += [
"--startup_blob", "--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) # Source Sets (aka static libraries)
# #
@ -341,11 +364,7 @@ source_set("v8_nosnapshot") {
configs -= [ "//build/config/compiler:chromium_code" ] configs -= [ "//build/config/compiler:chromium_code" ]
configs += [ "//build/config/compiler:no_chromium_code" ] configs += [ "//build/config/compiler:no_chromium_code" ]
configs += [ configs += [ ":internal_config", ":features", ":toolchain" ]
":internal_config",
":features",
":toolchain",
]
} }
source_set("v8_snapshot") { source_set("v8_snapshot") {
@ -366,11 +385,7 @@ source_set("v8_snapshot") {
configs -= [ "//build/config/compiler:chromium_code" ] configs -= [ "//build/config/compiler:chromium_code" ]
configs += [ "//build/config/compiler:no_chromium_code" ] configs += [ "//build/config/compiler:no_chromium_code" ]
configs += [ configs += [ ":internal_config", ":features", ":toolchain" ]
":internal_config",
":features",
":toolchain",
]
} }
if (v8_use_external_startup_data) { if (v8_use_external_startup_data) {
@ -392,11 +407,7 @@ if (v8_use_external_startup_data) {
configs -= [ "//build/config/compiler:chromium_code" ] configs -= [ "//build/config/compiler:chromium_code" ]
configs += [ "//build/config/compiler:no_chromium_code" ] configs += [ "//build/config/compiler:no_chromium_code" ]
configs += [ configs += [ ":internal_config", ":features", ":toolchain" ]
":internal_config",
":features",
":toolchain",
]
} }
} }
@ -1201,11 +1212,7 @@ source_set("v8_base") {
configs -= [ "//build/config/compiler:chromium_code" ] configs -= [ "//build/config/compiler:chromium_code" ]
configs += [ "//build/config/compiler:no_chromium_code" ] configs += [ "//build/config/compiler:no_chromium_code" ]
configs += [ configs += [ ":internal_config", ":features", ":toolchain" ]
":internal_config",
":features",
":toolchain",
]
if (!is_debug) { if (!is_debug) {
configs -= [ "//build/config/compiler:optimize" ] configs -= [ "//build/config/compiler:optimize" ]
@ -1213,9 +1220,7 @@ source_set("v8_base") {
} }
defines = [] defines = []
deps = [ deps = [ ":v8_libbase" ]
":v8_libbase",
]
if (is_win) { if (is_win) {
# TODO(jschuh): crbug.com/167187 fix size_t to int truncations. # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
@ -1227,7 +1232,6 @@ source_set("v8_base") {
if (is_win) { if (is_win) {
deps += [ "//third_party/icu:icudata" ] deps += [ "//third_party/icu:icudata" ]
} }
# TODO(jochen): Add support for icu_use_data_file_flag # TODO(jochen): Add support for icu_use_data_file_flag
defines += [ "ICU_UTIL_DATA_IMPL=ICU_UTIL_DATA_FILE" ] defines += [ "ICU_UTIL_DATA_IMPL=ICU_UTIL_DATA_FILE" ]
} else { } else {
@ -1296,11 +1300,7 @@ source_set("v8_libbase") {
configs -= [ "//build/config/compiler:chromium_code" ] configs -= [ "//build/config/compiler:chromium_code" ]
configs += [ "//build/config/compiler:no_chromium_code" ] configs += [ "//build/config/compiler:no_chromium_code" ]
configs += [ configs += [ ":internal_config_base", ":features", ":toolchain" ]
":internal_config_base",
":features",
":toolchain",
]
if (!is_debug) { if (!is_debug) {
configs -= [ "//build/config/compiler:optimize" ] configs -= [ "//build/config/compiler:optimize" ]
@ -1310,11 +1310,15 @@ source_set("v8_libbase") {
defines = [] defines = []
if (is_posix) { if (is_posix) {
sources += [ "src/base/platform/platform-posix.cc" ] sources += [
"src/base/platform/platform-posix.cc"
]
} }
if (is_linux) { if (is_linux) {
sources += [ "src/base/platform/platform-linux.cc" ] sources += [
"src/base/platform/platform-linux.cc"
]
libs = [ "rt" ] libs = [ "rt" ]
} else if (is_android) { } else if (is_android) {
@ -1343,10 +1347,7 @@ source_set("v8_libbase") {
defines += [ "_CRT_RAND_S" ] # for rand_s() defines += [ "_CRT_RAND_S" ] # for rand_s()
libs = [ libs = [ "winmm.lib", "ws2_32.lib" ]
"winmm.lib",
"ws2_32.lib",
]
} }
# TODO(jochen): Add support for qnx, freebsd, openbsd, netbsd, and solaris. # TODO(jochen): Add support for qnx, freebsd, openbsd, netbsd, and solaris.
@ -1365,11 +1366,7 @@ source_set("v8_libplatform") {
configs -= [ "//build/config/compiler:chromium_code" ] configs -= [ "//build/config/compiler:chromium_code" ]
configs += [ "//build/config/compiler:no_chromium_code" ] configs += [ "//build/config/compiler:no_chromium_code" ]
configs += [ configs += [ ":internal_config_base", ":features", ":toolchain" ]
":internal_config_base",
":features",
":toolchain",
]
if (!is_debug) { if (!is_debug) {
configs -= [ "//build/config/compiler:optimize" ] configs -= [ "//build/config/compiler:optimize" ]
@ -1395,11 +1392,7 @@ if (current_toolchain == host_toolchain) {
configs -= [ "//build/config/compiler:chromium_code" ] configs -= [ "//build/config/compiler:chromium_code" ]
configs += [ "//build/config/compiler:no_chromium_code" ] configs += [ "//build/config/compiler:no_chromium_code" ]
configs += [ configs += [ ":internal_config", ":features", ":toolchain" ]
":internal_config",
":features",
":toolchain",
]
deps = [ deps = [
":v8_base", ":v8_base",
@ -1415,64 +1408,64 @@ if (current_toolchain == host_toolchain) {
# #
if (component_mode == "shared_library") { if (component_mode == "shared_library") {
component("v8") {
sources = [ component("v8") {
"src/v8dll-main.cc", sources = [
"src/v8dll-main.cc",
]
if (v8_use_snapshot && v8_use_external_startup_data) {
deps = [
":v8_base",
":v8_external_snapshot",
] ]
} else if (v8_use_snapshot) {
if (v8_use_snapshot && v8_use_external_startup_data) { deps = [
deps = [ ":v8_base",
":v8_base", ":v8_snapshot",
":v8_external_snapshot", ]
] } else {
} else if (v8_use_snapshot) { assert(!v8_use_external_startup_data)
deps = [ deps = [
":v8_base", ":v8_base",
":v8_snapshot", ":v8_nosnapshot",
]
} else {
assert(!v8_use_external_startup_data)
deps = [
":v8_base",
":v8_nosnapshot",
]
}
configs -= [ "//build/config/compiler:chromium_code" ]
configs += [ "//build/config/compiler:no_chromium_code" ]
configs += [
":internal_config",
":features",
":toolchain",
] ]
direct_dependent_configs = [ ":external_config" ]
libs = []
if (is_android && current_toolchain != host_toolchain) {
libs += [ "log" ]
}
} }
} else {
group("v8") {
if (v8_use_snapshot && v8_use_external_startup_data) {
deps = [
":v8_base",
":v8_external_snapshot",
]
} else if (v8_use_snapshot) {
deps = [
":v8_base",
":v8_snapshot",
]
} else {
assert(!v8_use_external_startup_data)
deps = [
":v8_base",
":v8_nosnapshot",
]
}
direct_dependent_configs = [ ":external_config" ] configs -= [ "//build/config/compiler:chromium_code" ]
configs += [ "//build/config/compiler:no_chromium_code" ]
configs += [ ":internal_config", ":features", ":toolchain" ]
direct_dependent_configs = [ ":external_config" ]
libs = []
if (is_android && current_toolchain != host_toolchain) {
libs += [ "log" ]
} }
} }
} else {
group("v8") {
if (v8_use_snapshot && v8_use_external_startup_data) {
deps = [
":v8_base",
":v8_external_snapshot",
]
} else if (v8_use_snapshot) {
deps = [
":v8_base",
":v8_snapshot",
]
} else {
assert(!v8_use_external_startup_data)
deps = [
":v8_base",
":v8_nosnapshot",
]
}
direct_dependent_configs = [ ":external_config" ]
}
}