diff options
| -rw-r--r-- | etc/dev/TARGETS | 3 | ||||
| -rw-r--r-- | etc/import/TARGETS.grpc | 15 | ||||
| -rw-r--r-- | etc/import/TARGETS.protobuf | 4 | ||||
| -rw-r--r-- | etc/import/TARGETS.zlib | 1 | ||||
| -rw-r--r-- | etc/repos.json | 11 | ||||
| -rw-r--r-- | src/buildtool/execution_api/remote/bazel/bytestream_client.hpp | 5 |
6 files changed, 27 insertions, 12 deletions
diff --git a/etc/dev/TARGETS b/etc/dev/TARGETS index 5da5014a..dbfbf15c 100644 --- a/etc/dev/TARGETS +++ b/etc/dev/TARGETS @@ -3,6 +3,9 @@ , "proto": [ ["@", "bazel_remote_apis", "", "remote_execution_proto"] , ["@", "googleapis", "", "google_bytestream_proto"] + , ["@", "googleapis", "", "google_api_httpbody_proto"] + , ["@", "googleapis", "", "google_api_expr_v1alpha1_checked_proto"] + , ["@", "googleapis", "", "google_api_expr_v1alpha1_syntax_proto"] ] } , "just-ext-hdrs": diff --git a/etc/import/TARGETS.grpc b/etc/import/TARGETS.grpc index 007f5a75..2341dfd1 100644 --- a/etc/import/TARGETS.grpc +++ b/etc/import/TARGETS.grpc @@ -2261,19 +2261,20 @@ { "type": "export" , "target": ["src/compiler", "grpc_cpp_plugin"] , "flexible_config": - [ "AR" + [ "OS" , "ARCH" - , "CC" - , "CFLAGS" - , "CXX" - , "CXXFLAGS" - , "ENV" , "HOST_ARCH" - , "OS" , "TARGET_ARCH" , "COMPILER_FAMILY" + , "DEBUG" + , "CC" + , "CXX" + , "CFLAGS" + , "CXXFLAGS" , "ADD_CFLAGS" , "ADD_CXXFLAGS" + , "AR" + , "ENV" ] } } diff --git a/etc/import/TARGETS.protobuf b/etc/import/TARGETS.protobuf index e23846ae..15f7e6d7 100644 --- a/etc/import/TARGETS.protobuf +++ b/etc/import/TARGETS.protobuf @@ -13,6 +13,7 @@ , "HOST_ARCH" , "TARGET_ARCH" , "COMPILER_FAMILY" + , "DEBUG" , "CXX" , "CXXFLAGS" , "ADD_CXXFLAGS" @@ -33,6 +34,7 @@ , "HOST_ARCH" , "TARGET_ARCH" , "COMPILER_FAMILY" + , "DEBUG" , "CXX" , "CXXFLAGS" , "ADD_CXXFLAGS" @@ -52,6 +54,7 @@ , "HOST_ARCH" , "TARGET_ARCH" , "COMPILER_FAMILY" + , "DEBUG" , "CXX" , "CXXFLAGS" , "ADD_CXXFLAGS" @@ -71,6 +74,7 @@ , "HOST_ARCH" , "TARGET_ARCH" , "COMPILER_FAMILY" + , "DEBUG" , "CXX" , "CXXFLAGS" , "ADD_CXXFLAGS" diff --git a/etc/import/TARGETS.zlib b/etc/import/TARGETS.zlib index 30778ed2..0b85bea6 100644 --- a/etc/import/TARGETS.zlib +++ b/etc/import/TARGETS.zlib @@ -23,6 +23,7 @@ , "ARCH" , "TARGET_ARCH" , "COMPILER_FAMILY" + , "DEBUG" , "CC" , "CFLAGS" , "ADD_CFLAGS" diff --git a/etc/repos.json b/etc/repos.json index d7274d03..4cb8e00c 100644 --- a/etc/repos.json +++ b/etc/repos.json @@ -79,8 +79,7 @@ , "target_root": "defaults" , "rule_root": "rules" , "target_file_name": "TARGETS.protobuf" - , "bindings": - {"base": "rules", "protoc": "protobuf", "grpc": "com_github_grpc_grpc"} + , "bindings": {"base": "rules"} } , "rules-grpc": { "repository": "rules" @@ -352,7 +351,13 @@ , "google_apis": "google_apis" } , "pkg_bootstrap": - {"copy": ["bin/grpc_cpp_plugin", "include/grpc", "include/grpcpp"]} + { "copy": + [ "bin/grpc_cpp_plugin" + , "include/grpc" + , "include/grpcpp" + , "include/grpc++" + ] + } } , "com_github_libgit2_libgit2": { "repository": diff --git a/src/buildtool/execution_api/remote/bazel/bytestream_client.hpp b/src/buildtool/execution_api/remote/bazel/bytestream_client.hpp index b9a55707..5f627faf 100644 --- a/src/buildtool/execution_api/remote/bazel/bytestream_client.hpp +++ b/src/buildtool/execution_api/remote/bazel/bytestream_client.hpp @@ -109,11 +109,12 @@ class ByteStreamClient { google::bytestream::WriteRequest request{}; request.set_resource_name(resource_name); request.set_allocated_data(allocated_data); + std::size_t pos{}; do { auto const size = std::min(data.size() - pos, kChunkSize); - allocated_data->resize(size); - data.copy(allocated_data->data(), size, pos); + request.mutable_data()->resize(size); + data.copy(request.mutable_data()->data(), size, pos); request.set_write_offset(static_cast<int>(pos)); request.set_finish_write(pos + size >= data.size()); if (not writer->Write(request)) { |