Merge pull request #977 from veblush/master

Add upb configuration to native-core
This commit is contained in:
Michael Lumish 2019-07-30 16:11:31 -07:00 committed by GitHub
commit 692ba8387c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 16 additions and 8 deletions

View File

@ -83,11 +83,14 @@
'include_dirs': [
'deps/grpc',
'deps/grpc/include',
'deps/grpc/src/core/ext/upb-generated',
'deps/grpc/third_party/abseil-cpp',
'deps/grpc/third_party/address_sorting/include',
'deps/grpc/third_party/cares',
'deps/grpc/third_party/cares/cares',
'deps/grpc/third_party/abseil-cpp',
'deps/grpc/third_party/nanopb',
'deps/grpc/third_party/upb',
'deps/grpc/third_party/upb/generated_for_cmake',
],
'defines': [
'PB_FIELD_32BIT',

View File

@ -68,13 +68,14 @@
"deps/grpc/include/grpc/**/*.h",
"deps/grpc/src/core/**/*.{c,cc,h}",
"deps/grpc/src/boringssl/err_data.c",
"deps/grpc/third_party/nanopb/*.{c,cc,h}",
"deps/grpc/third_party/zlib/**/*.{c,cc,h}",
"deps/grpc/third_party/abseil-cpp/absl/**/*.{h,hh}",
"deps/grpc/third_party/boringssl/crypto/**/*.{c,cc,h}",
"deps/grpc/third_party/boringssl/include/**/*.{c,cc,h}",
"deps/grpc/third_party/boringssl/ssl/**/*.{c,cc,h}",
"deps/grpc/third_party/boringssl/third_party/**/*.{c,h}",
"deps/grpc/third_party/abseil-cpp/absl/**/*.{h,hh}",
"deps/grpc/third_party/nanopb/*.{c,cc,h}",
"deps/grpc/third_party/upb/**/*.{c,h}",
"deps/grpc/third_party/zlib/**/*.{c,cc,h}",
"binding.gyp"
],
"main": "index.js",

View File

@ -75,11 +75,14 @@
'include_dirs': [
'deps/grpc',
'deps/grpc/include',
'deps/grpc/src/core/ext/upb-generated',
'deps/grpc/third_party/abseil-cpp',
'deps/grpc/third_party/address_sorting/include',
'deps/grpc/third_party/cares',
'deps/grpc/third_party/cares/cares',
'deps/grpc/third_party/abseil-cpp',
'deps/grpc/third_party/nanopb',
'deps/grpc/third_party/upb',
'deps/grpc/third_party/upb/generated_for_cmake',
],
'defines': [
'PB_FIELD_32BIT',

View File

@ -70,13 +70,14 @@
"deps/grpc/include/grpc/**/*.h",
"deps/grpc/src/core/**/*.{c,cc,h}",
"deps/grpc/src/boringssl/err_data.c",
"deps/grpc/third_party/nanopb/*.{c,cc,h}",
"deps/grpc/third_party/zlib/**/*.{c,cc,h}",
"deps/grpc/third_party/abseil-cpp/absl/**/*.{h,hh}",
"deps/grpc/third_party/boringssl/crypto/**/*.{c,cc,h}",
"deps/grpc/third_party/boringssl/include/**/*.{c,cc,h}",
"deps/grpc/third_party/boringssl/ssl/**/*.{c,cc,h}",
"deps/grpc/third_party/boringssl/third_party/**/*.{c,h}",
"deps/grpc/third_party/abseil-cpp/absl/**/*.{h,hh}",
"deps/grpc/third_party/nanopb/*.{c,cc,h}",
"deps/grpc/third_party/upb/**/*.{c,h}",
"deps/grpc/third_party/zlib/**/*.{c,cc,h}",
"binding.gyp"
],
"main": "index.js",