aboutsummaryrefslogtreecommitdiff
path: root/deps
diff options
context:
space:
mode:
authorBen Noordhuis <info@bnoordhuis.nl>2016-06-29 23:20:06 +0200
committerBen Noordhuis <info@bnoordhuis.nl>2016-09-23 18:51:47 +0200
commit782620f03ffcaa5be9e84f8f15a638cb7c03e464 (patch)
treee1eef1626561518a5e8afd151281146a4706de9a /deps
parenta8d2c9d7750f05ae78b6b6b8de3c3161c7f6270e (diff)
downloadandroid-node-v8-782620f03ffcaa5be9e84f8f15a638cb7c03e464.tar.gz
android-node-v8-782620f03ffcaa5be9e84f8f15a638cb7c03e464.tar.bz2
android-node-v8-782620f03ffcaa5be9e84f8f15a638cb7c03e464.zip
src: add /json/protocol endpoint to inspector
Embed the compressed and minified protocol.json from the bundled v8_inspector and make it available through the /json/protocol endpoint. Refs: https://github.com/nodejs/diagnostics/issues/52 PR-URL: https://github.com/nodejs/node/pull/7491 Reviewed-By: Colin Ihrig <cjihrig@gmail.com> Reviewed-By: James M Snell <jasnell@gmail.com>
Diffstat (limited to 'deps')
-rw-r--r--deps/zlib/zlib.gyp4
1 files changed, 4 insertions, 0 deletions
diff --git a/deps/zlib/zlib.gyp b/deps/zlib/zlib.gyp
index cf0b090d9e..65133d5fce 100644
--- a/deps/zlib/zlib.gyp
+++ b/deps/zlib/zlib.gyp
@@ -12,6 +12,7 @@
{
'target_name': 'zlib',
'type': 'static_library',
+ 'defines': [ 'ZLIB_CONST' ],
'sources': [
'adler32.c',
'compress.c',
@@ -44,6 +45,7 @@
'.',
],
'direct_dependent_settings': {
+ 'defines': [ 'ZLIB_CONST' ],
'include_dirs': [
'.',
],
@@ -72,10 +74,12 @@
'direct_dependent_settings': {
'defines': [
'USE_SYSTEM_ZLIB',
+ 'ZLIB_CONST',
],
},
'defines': [
'USE_SYSTEM_ZLIB',
+ 'ZLIB_CONST',
],
'link_settings': {
'libraries': [