Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code

Unified Diff: BUILD.gn

Issue 29720588: Issue 6396 - Error creating non debug build config (Closed)
Patch Set: Created March 12, 2018, 11:18 a.m.
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | gni/v8.gni » ('j') | gni/v8.gni » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: BUILD.gn
diff --git a/BUILD.gn b/BUILD.gn
index 9d95036a958fc8bf0c2531e96a062cee6abc9c66..af137517d472244e29b9d23d28dee2bd146495d0 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -164,7 +164,7 @@ config("internal_config") {
include_dirs = [ "." ]
- if (is_component_build) {
+ if (is_component_build || v8_component_build) {
defines = [ "BUILDING_V8_SHARED" ]
}
}
@@ -185,7 +185,7 @@ config("libplatform_config") {
# This config should be applied to code using the libbase.
config("libbase_config") {
- if (is_component_build) {
+ if (is_component_build || v8_component_build) {
defines = [ "USING_V8_BASE_SHARED" ]
}
libs = []
@@ -202,7 +202,7 @@ config("libsampler_config") {
# This config should only be applied to code using V8 and not any V8 code
# itself.
config("external_config") {
- if (is_component_build) {
+ if (is_component_build || v8_component_build) {
defines = [ "USING_V8_SHARED" ]
}
include_dirs = [
@@ -767,9 +767,8 @@ action("run_mksnapshot") {
]
args = [
- "./" + rebase_path(get_label_info(":mksnapshot($v8_snapshot_toolchain)",
- "root_out_dir") + "/mksnapshot",
- root_build_dir),
sergei 2018/03/12 12:43:31 Is it correct that `root_build_dir` is removed now
anton 2018/03/12 12:51:22 Previously it was relative path (relative to build
+ rebase_path(get_label_info(":mksnapshot($v8_snapshot_toolchain)",
+ "root_out_dir") + "/mksnapshot"),
"--startup_src",
rebase_path("$target_gen_dir/snapshot.cc", root_build_dir),
]
@@ -834,6 +833,7 @@ action("v8_dump_build_config") {
"v8_enable_i18n_support=$v8_enable_i18n_support",
"v8_target_cpu=\"$v8_target_cpu\"",
"v8_use_snapshot=$v8_use_snapshot",
+ "v8_component_build=$v8_component_build"
]
}
@@ -2393,6 +2393,7 @@ v8_source_set("v8_base") {
}
v8_component("v8_libbase") {
+ force_shared_library = true
sources = [
"src/base/adapters.h",
"src/base/atomic-utils.h",
@@ -2460,7 +2461,7 @@ v8_component("v8_libbase") {
defines = []
- if (is_component_build) {
+ if (is_component_build || v8_component_build) {
defines = [ "BUILDING_V8_BASE_SHARED" ]
}
@@ -2630,6 +2631,13 @@ if (current_toolchain == v8_snapshot_toolchain) {
configs = [ ":internal_config" ]
+ if (v8_component_build) {
+ configs += [
+ "//build/config/gcc:rpath_for_built_shared_libraries",
+ #"//build/config/gcc:executable_ldconfig"
sergei 2018/03/12 12:43:31 The commented line.
anton 2018/03/12 12:51:22 Right, it's because the task is not finished yet.
+ ]
+ }
+
deps = [
":v8_base",
":v8_builtins_setup",
@@ -2716,8 +2724,10 @@ group("v8_fuzzers") {
]
}
-if (is_component_build) {
+# we need to have v8 shared libs as we have to link libadblockplus-jni.so with it
+if (true) {
v8_component("v8") {
+ force_shared_library = true
sources = [
"src/v8dll-main.cc",
]
« no previous file with comments | « no previous file | gni/v8.gni » ('j') | gni/v8.gni » ('J')

Powered by Google App Engine
This is Rietveld