Updating build files with changing upb directories.

6 years ago · 81da76ca3e
parent fabad6e687
commit 81da76ca3e
5 changed files with 6 additions and 6 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -5769,7 +5769,7 @@ endif (gRPC_BUILD_CSHARP_EXT)
 if (gRPC_BUILD_TESTS)

 add_library(upb
-  third_party/upb/google/protobuf/descriptor.upb.c
+  third_party/upb/generated_for_cmake/google/protobuf/descriptor.upb.c
  third_party/upb/upb/decode.c
  third_party/upb/upb/def.c
  third_party/upb/upb/encode.c
--- a/2
+++ b/2
@ -8407,7 +8407,7 @@ endif


 LIBUPB_SRC = \
-    third_party/upb/google/protobuf/descriptor.upb.c \
+    third_party/upb/generated_for_cmake/google/protobuf/descriptor.upb.c \
    third_party/upb/upb/decode.c \
    third_party/upb/upb/def.c \
    third_party/upb/upb/encode.c \
--- a/grpc.gyp
+++ b/grpc.gyp
@ -2150,7 +2150,7 @@
      'dependencies': [
      ],
      'sources': [
-        'third_party/upb/google/protobuf/descriptor.upb.c',
+        'third_party/upb/generated_for_cmake/google/protobuf/descriptor.upb.c',
        'third_party/upb/upb/decode.c',
        'third_party/upb/upb/def.c',
        'third_party/upb/upb/encode.c',
--- a/src/upb/gen_build_yaml.py
+++ b/src/upb/gen_build_yaml.py
@ -22,7 +22,7 @@ import sys
 import yaml

 srcs = [
-  "third_party/upb/google/protobuf/descriptor.upb.c",
+  "third_party/upb/generated_for_cmake/google/protobuf/descriptor.upb.c",
  "third_party/upb/upb/decode.c",
  "third_party/upb/upb/def.c",
  "third_party/upb/upb/encode.c",
@ -35,7 +35,7 @@ srcs = [
 ]

 hdrs = [
-  "third_party/upb/google/protobuf/descriptor.upb.h",
+  "third_party/upb/generated_for_cmake/google/protobuf/descriptor.upb.h",
  "third_party/upb/upb/decode.h",
  "third_party/upb/upb/def.h",
  "third_party/upb/upb/encode.h",
--- a/tools/run_tests/generated/sources_and_headers.json
+++ b/tools/run_tests/generated/sources_and_headers.json
@ -7687,7 +7687,7 @@
  {
    "deps": [], 
    "headers": [
-      "third_party/upb/google/protobuf/descriptor.upb.h", 
+      "third_party/upb/generated_for_cmake/google/protobuf/descriptor.upb.h", 
      "third_party/upb/upb/decode.h", 
      "third_party/upb/upb/def.h", 
      "third_party/upb/upb/encode.h",