From 2e16f16ec472aac320a13b4bd7821ef86163634a Mon Sep 17 00:00:00 2001 From: Esun Kim Date: Tue, 30 Jul 2019 11:01:44 -0700 Subject: [PATCH] Add upb configuration to native-core --- packages/grpc-native-core/binding.gyp | 5 ++++- packages/grpc-native-core/package.json | 8 +++++--- packages/grpc-native-core/templates/binding.gyp.template | 5 ++++- packages/grpc-native-core/templates/package.json.template | 8 +++++--- 4 files changed, 18 insertions(+), 8 deletions(-) diff --git a/packages/grpc-native-core/binding.gyp b/packages/grpc-native-core/binding.gyp index 06fcb76e..6dae2c5b 100644 --- a/packages/grpc-native-core/binding.gyp +++ b/packages/grpc-native-core/binding.gyp @@ -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', diff --git a/packages/grpc-native-core/package.json b/packages/grpc-native-core/package.json index 870f4056..ad6d2f5b 100644 --- a/packages/grpc-native-core/package.json +++ b/packages/grpc-native-core/package.json @@ -68,13 +68,15 @@ "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/generated_for_cmake/google/protobuf/*.{c,h}", + "deps/grpc/third_party/upb/upb/*.{c,h}", + "deps/grpc/third_party/zlib/**/*.{c,cc,h}", "binding.gyp" ], "main": "index.js", diff --git a/packages/grpc-native-core/templates/binding.gyp.template b/packages/grpc-native-core/templates/binding.gyp.template index 8c145d4a..cdf1a1a0 100644 --- a/packages/grpc-native-core/templates/binding.gyp.template +++ b/packages/grpc-native-core/templates/binding.gyp.template @@ -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', diff --git a/packages/grpc-native-core/templates/package.json.template b/packages/grpc-native-core/templates/package.json.template index 9949797c..be994bf1 100644 --- a/packages/grpc-native-core/templates/package.json.template +++ b/packages/grpc-native-core/templates/package.json.template @@ -70,13 +70,15 @@ "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/generated_for_cmake/google/protobuf/*.{c,h}", + "deps/grpc/third_party/upb/upb/*.{c,h}", + "deps/grpc/third_party/zlib/**/*.{c,cc,h}", "binding.gyp" ], "main": "index.js",