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

Unified Diff: v8.gypi

Issue 29783566: Issue 6596 - update to work with v8 6.7.288.11 (Closed) Base URL: https://github.com/adblockplus/libadblockplus@99836840e314b7941fdb51cb2b91f23ca3ee3414
Patch Set: Created May 16, 2018, 10:17 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
Index: v8.gypi
diff --git a/v8.gypi b/v8.gypi
index e37733214b670bc53a39d04044b15ea8f90cd133..c205a6ffbe6c959cb741e7b25ab79e57226c4314 100644
--- a/v8.gypi
+++ b/v8.gypi
@@ -1,75 +1,18 @@
{
'variables': {
- 'libv8_include_dir%': 'third_party/v8/include',
- 'libv8_build_targets': [],
- 'libv8_no_build%': 0,
+ 'v8_dir%': 'build/v8/',
+ 'libv8_include_dir%': '>(v8_dir)/include',
+ 'libv8_lib_dir%': '>(v8_dir)/<(OS)-<(target_arch).<(CONFIGURATION_NAME)',
'conditions': [[
- 'OS=="win"', {
- 'libv8_lib_dir%': 'v8/third_party/v8/src/<(CONFIGURATION_NAME)',
- 'libv8_libs': [
- '-lv8_libplatform',
- '-lv8_base_0',
- '-lv8_base_1',
- '-lv8_base_2',
- '-lv8_base_3',
- '-lv8_libbase',
- '-lv8_libsampler',
- '-lv8_snapshot',
+ 'OS=="android"', {
+ 'libv8_libs%': [
+ '>(libv8_lib_dir)/libv8_monolith.a',
],
- }],
- ['OS=="linux" or OS=="mac"', {
- 'libv8_lib_dir%': 'v8/out/<(CONFIGURATION_NAME)',
- 'libv8_libs': [
- '-lv8_libplatform',
- '-lv8_base',
- '-lv8_snapshot',
- '-lv8_libbase',
- '-lv8_libsampler',
- ]
- }],
- ['OS=="android"', {
- 'libv8_lib_dir%': '', # must be specified, e.g. in Makefile
- 'libv8_libs': [
- '<(libv8_lib_dir)/libv8_libplatform.a',
- '<(libv8_lib_dir)/libv8_base.a',
- '<(libv8_lib_dir)/libv8_snapshot.a',
- '<(libv8_lib_dir)/libv8_libbase.a',
- '<(libv8_lib_dir)/libv8_libsampler.a',
+ }, {
+ 'libv8_libs%': [
+ '-lv8_monolith',
],
- }],
+ }]
]
},
- 'conditions': [[
- 'OS=="win" and libv8_no_build!="true"', {
- 'variables': {
- 'libv8_build_targets': ['build-v8'],
- },
- 'targets': [{
- 'target_name': 'build-v8',
- 'type': 'none',
- 'actions': [{
- 'action_name': 'build-v8',
- 'inputs': ['build-v8.cmd'],
- 'outputs': [
- 'build/<(target_arch)/v8/build/<(CONFIGURATION_NAME)/v8_libplatform.lib',
- 'build/<(target_arch)/v8/build/<(CONFIGURATION_NAME)/v8_base_0.lib',
- 'build/<(target_arch)/v8/build/<(CONFIGURATION_NAME)/v8_base_1.lib',
- 'build/<(target_arch)/v8/build/<(CONFIGURATION_NAME)/v8_base_2.lib',
- 'build/<(target_arch)/v8/build/<(CONFIGURATION_NAME)/v8_base_3.lib',
- 'build/<(target_arch)/v8/build/<(CONFIGURATION_NAME)/v8_libbase.lib',
- 'build/<(target_arch)/v8/build/<(CONFIGURATION_NAME)/v8_libsampler.lib',
- 'build/<(target_arch)/v8/build/<(CONFIGURATION_NAME)/v8_snapshot.lib',
- ],
- 'action': [
- 'cmd',
- '/C',
- 'build-v8.cmd',
- '$(MSBuildBinPath)',
- '<(target_arch)',
- '<(CONFIGURATION_NAME)'
- ]
- }],
- }]
- }
- ]],
}

Powered by Google App Engine
This is Rietveld