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

Side by Side Diff: common.gypi

Issue 29748587: Issue 6063, 6531 - Update V8 to 6.5.254.41, use C++14 and NDK-r16b (Closed) Base URL: https://github.com/adblockplus/libadblockplus@549616e865707b89e95659d55c70e22d63130ce5
Patch Set: fix and simplify build for Windows Created April 18, 2018, 6:41 p.m.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View unified diff | Download patch
« no previous file with comments | « build-v8.gypi ('k') | createsolution.bat » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 { 1 {
2 'variables': { 2 'variables': {
3 'component%': 'static_library', 3 'component%': 'static_library',
4 'visibility%': 'hidden', 4 'visibility%': 'hidden',
5 'library%': 'static_library', 5 'library%': 'static_library',
6 }, 6 },
7 7
8 'conditions': [ 8 'conditions': [
9 ['OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris" \ 9 ['OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris" \
10 or OS=="netbsd" or OS=="android"', { 10 or OS=="netbsd" or OS=="android"', {
11 'target_defaults': { 11 'target_defaults': {
12 'cflags': [ '-pthread' ], 12 'cflags': [ '-pthread' ],
13 # V8 headers cause a build error on recent gcc. 13 # V8 headers cause a build error on recent gcc.
14 # Adding -fpermissive to solve this. 14 # Adding -fpermissive to solve this.
15 # See https://issues.adblockplus.org/ticket/4950 15 # See https://issues.adblockplus.org/ticket/4950
16 # We might be able to do without after upgrading V8. 16 # We might be able to do without after upgrading V8.
17 'cflags_cc': [ '-fno-rtti', '-std=c++11', '-fexceptions', '-fpermissive' ], 17 'cflags_cc': [ '-fno-rtti', '-std=c++14', '-fexceptions', '-fpermissive' ],
18 'cflags!': [ '-Werror', ], 18 'cflags!': [ '-Werror', ],
19 'ldflags': [ '-pthread', ], 19 'ldflags': [ '-pthread', ],
20 }, 20 },
21 }], 21 }],
22 ['OS=="mac"', { 22 ['OS=="mac"', {
23 'xcode_settings': { 23 'xcode_settings': {
24 'CLANG_CXX_LANGUAGE_STANDARD': 'c++11', 24 'CLANG_CXX_LANGUAGE_STANDARD': 'c++14',
25 'CLANG_CXX_LIBRARY': 'libc++', 25 'CLANG_CXX_LIBRARY': 'libc++',
26 }, 26 },
27 }], 27 }],
28 ], 28 ],
29 'target_conditions': [ 29 'target_conditions': [
30 ['OS=="android" and not "host" in toolsets', { 30 ['OS=="android" and not "host" in toolsets', {
31 'target_defaults': { 31 'target_defaults': {
32 'cflags!': [ 32 'cflags!': [
33 '-pthread', # Not fully supported by Android toolchain. Built-in supo rt of major functions, no need to link with it. 33 '-pthread', # Not fully supported by Android toolchain. Built-in supo rt of major functions, no need to link with it.
34 ], 34 ],
(...skipping 11 matching lines...) Expand all
46 'Release': {} 46 'Release': {}
47 }, 47 },
48 'msvs_cygwin_shell': 0, 48 'msvs_cygwin_shell': 0,
49 'target_conditions': [ 49 'target_conditions': [
50 ['_type=="static_library"', { 50 ['_type=="static_library"', {
51 'standalone_static_library': 1 51 'standalone_static_library': 1
52 }] 52 }]
53 ] 53 ]
54 } 54 }
55 } 55 }
OLDNEW
« no previous file with comments | « build-v8.gypi ('k') | createsolution.bat » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld