Merge branch 'main' into v2

CMakeLists.txt

@@ -139,12 +139,17 @@ set(fpserver_SOURCES
     src/server/grpc/proto/index.pb.cc
     src/server/grpc/proto/index.grpc.pb.h
     src/server/grpc/proto/index.grpc.pb.cc
+    src/server/grpc/proto/google/api/annotations.pb.h
+    src/server/grpc/proto/google/api/annotations.pb.cc
+    src/server/grpc/proto/google/api/http.pb.h
+    src/server/grpc/proto/google/api/http.pb.cc
 )
 add_library(fpserverlib ${fpserver_SOURCES})
 target_link_libraries(fpserverlib fpindexlib qhttp PkgConfig::GRPCPP PkgConfig::PROTOBUF)
 
 include_directories(
 	${CMAKE_CURRENT_SOURCE_DIR}/src
+	${CMAKE_CURRENT_SOURCE_DIR}/src/server/grpc/proto
 	${CMAKE_CURRENT_SOURCE_DIR}/src/3rdparty/qhttp/3rdparty
 	${CMAKE_CURRENT_SOURCE_DIR}/src/3rdparty/qhttp/src
     ${GTEST_INCLUDE_DIRS}

src/server/grpc/proto/google/api/annotations.proto

@@ -0,0 +1,31 @@
+// Copyright 2015 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+syntax = "proto3";
+
+package google.api;
+
+import "google/api/http.proto";
+import "google/protobuf/descriptor.proto";
+
+option go_package = "google.golang.org/genproto/googleapis/api/annotations;annotations";
+option java_multiple_files = true;
+option java_outer_classname = "AnnotationsProto";
+option java_package = "com.google.api";
+option objc_class_prefix = "GAPI";
+
+extend google.protobuf.MethodOptions {
+  // See `HttpRule`.
+  HttpRule http = 72295728;
+}