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

Unified Diff: gni/v8.gni

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
« BUILD.gn ('K') | « BUILD.gn ('k') | src/inspector/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: gni/v8.gni
diff --git a/gni/v8.gni b/gni/v8.gni
index 0467720f456680db76c765b6f57a9f45354c8197..a9870c9b0bcdad3846481aad485873c1c4521eb2 100644
--- a/gni/v8.gni
+++ b/gni/v8.gni
@@ -45,6 +45,9 @@ declare_args() {
# Use static libraries instead of source_sets.
v8_static_library = false
+
+ # we need to have libv8.cr.so and some other shared libraries to link libadblockplus-android.so
+ v8_component_build = false
anton 2018/03/12 11:23:19 now we should add "v8_component_build=true": gn g
}
if (v8_use_external_startup_data == "") {
@@ -167,10 +170,32 @@ template("v8_executable") {
}
template("v8_component") {
- component(target_name) {
- forward_variables_from(invoker, "*", [ "configs" ])
- configs += invoker.configs
- configs -= v8_remove_configs
- configs += v8_add_configs
+
+ if (defined(invoker.force_shared_library) && invoker.force_shared_library) {
+ shared_library(target_name) {
+ output_extension = "cr.so" # override default .so with .cr.so
sergei 2018/03/12 12:43:32 it would be better to put the reason it's overridd
anton 2018/03/12 12:51:22 yes, i agree the comment could be better. Actually
jens 2018/03/13 13:17:48 You could just add a link to the ticket which expl
+ forward_variables_from(invoker, "*", [ "configs" ])
+ configs += invoker.configs
+ configs -= v8_remove_configs
+ configs += v8_add_configs
+
+ if (is_android) {
+ configs -= [ "//build/config/android:hide_all_but_jni_onload" ]
+ }
+
+ if (!defined(deps)) {
+ deps = []
+ }
+
+ deps += [ "//build/config:exe_and_shlib_deps" ]
+ }
+ } else {
+ component(target_name) {
+ forward_variables_from(invoker, "*", [ "configs" ])
+ configs += invoker.configs
+ configs -= v8_remove_configs
+ configs += v8_add_configs
+ }
}
+
}
« BUILD.gn ('K') | « BUILD.gn ('k') | src/inspector/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld