From 81da76ca3eb189b5169356826ac90b623c70f700 Mon Sep 17 00:00:00 2001 From: "Nicolas \"Pixel\" Noble" Date: Wed, 26 Jun 2019 01:13:28 +0200 Subject: [PATCH] Updating build files with changing upb directories. --- CMakeLists.txt | 2 +- Makefile | 2 +- grpc.gyp | 2 +- src/upb/gen_build_yaml.py | 4 ++-- tools/run_tests/generated/sources_and_headers.json | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index a34f9265256..bacaac86953 100644 --- 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 diff --git a/Makefile b/Makefile index 9930fc35a25..898acc29007 100644 --- a/Makefile +++ b/Makefile @@ -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 \ diff --git a/grpc.gyp b/grpc.gyp index 6268bed7bb0..0dc1c662f7a 100644 --- 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', diff --git a/src/upb/gen_build_yaml.py b/src/upb/gen_build_yaml.py index 8b726d374a3..181d026fbd2 100755 --- 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", diff --git a/tools/run_tests/generated/sources_and_headers.json b/tools/run_tests/generated/sources_and_headers.json index 8765f216dab..2a8ed7367f4 100644 --- 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",