diff options
| author | pg <pg@yandex-team.com> | 2024-06-20 20:40:55 +0300 |
|---|---|---|
| committer | pg <pg@yandex-team.com> | 2024-06-20 20:54:36 +0300 |
| commit | 19f80c3320fe379da42162b2b515b72ed92da170 (patch) | |
| tree | 8cabef9cd6531d9bcd51774c2a5e1eced5f96429 | |
| parent | 4dcd90d1608edb25a252dd6e41c7ac83c20b7402 (diff) | |
| download | ydb-19f80c3320fe379da42162b2b515b72ed92da170.tar.gz | |
304c8527dd2afe95b8027de1e37c625914b755e0
5 files changed, 35 insertions, 8 deletions
diff --git a/build/conf/proto.conf b/build/conf/proto.conf index 42a32ac3ae..b761f84823 100644 --- a/build/conf/proto.conf +++ b/build/conf/proto.conf @@ -561,7 +561,7 @@ macro GRPC() { PY_PROTO_PLUGIN(grpc_py _pb2_grpc.py contrib/tools/protoc/plugins/grpc_python DEPS contrib/python/grpcio) # Java - JAVA_PROTO_PLUGIN(grpc_java contrib/tools/protoc/plugins/grpc_java DEPS $JAVA_GRPC_STUB $JAVA_GRPC_PROTOBUF) + JAVA_PROTO_PLUGIN(grpc_java build/prebuilt/contrib/tools/protoc/plugins/grpc_java DEPS $JAVA_GRPC_STUB $JAVA_GRPC_PROTOBUF) SET_APPEND(JAVA_PROTOBUF_PEERS contrib/java/javax/annotation/javax.annotation-api/1.3.1) } diff --git a/build/prebuilt/contrib/tools/protoc/plugins/grpc_java/resources.json b/build/prebuilt/contrib/tools/protoc/plugins/grpc_java/resources.json new file mode 100644 index 0000000000..ca60d5634d --- /dev/null +++ b/build/prebuilt/contrib/tools/protoc/plugins/grpc_java/resources.json @@ -0,0 +1,19 @@ +{ + "by_platform": { + "darwin-arm64": { + "uri": "sbr:6538659252" + }, + "darwin-x86_64": { + "uri": "sbr:6538635125" + }, + "linux-x86_64": { + "uri": "sbr:6538599922" + }, + "linux-aarch64": { + "uri": "sbr:6538555418" + }, + "win32-x86_64": { + "uri": "sbr:6538717281" + } + } +}
\ No newline at end of file diff --git a/build/prebuilt/contrib/tools/protoc/plugins/grpc_java/ya.make b/build/prebuilt/contrib/tools/protoc/plugins/grpc_java/ya.make new file mode 100644 index 0000000000..b72c4c494f --- /dev/null +++ b/build/prebuilt/contrib/tools/protoc/plugins/grpc_java/ya.make @@ -0,0 +1,5 @@ +INCLUDE(ya.make.prebuilt) + +IF (NOT PREBUILT) + MESSAGE(FATAL_ERROR Unsupported host platform for prebuilt grpc_java tool) +ENDIF() diff --git a/build/prebuilt/contrib/tools/protoc/plugins/grpc_java/ya.make.prebuilt b/build/prebuilt/contrib/tools/protoc/plugins/grpc_java/ya.make.prebuilt new file mode 100644 index 0000000000..92f585a60f --- /dev/null +++ b/build/prebuilt/contrib/tools/protoc/plugins/grpc_java/ya.make.prebuilt @@ -0,0 +1,9 @@ +SET_RESOURCE_URI_FROM_JSON(SANDBOX_RESOURCE_URI ${ARCADIA_ROOT}/build/prebuilt/contrib/tools/protoc/plugins/grpc_java/resources.json) +ENABLE(PREBUILT) + +PREBUILT_PROGRAM() + IF (SANDBOX_RESOURCE_URI != "") + DECLARE_EXTERNAL_RESOURCE(GRPC_JAVA ${SANDBOX_RESOURCE_URI}) + PRIMARY_OUTPUT(${GRPC_JAVA_RESOURCE_GLOBAL}/grpc_java${MODULE_SUFFIX}) + ENDIF() +END() diff --git a/contrib/tools/protoc/plugins/grpc_java/ya.make b/contrib/tools/protoc/plugins/grpc_java/ya.make index 5ce576a1d2..8826b33daf 100644 --- a/contrib/tools/protoc/plugins/grpc_java/ya.make +++ b/contrib/tools/protoc/plugins/grpc_java/ya.make @@ -1,10 +1,4 @@ -IF (USE_PREBUILT_TOOLS) - INCLUDE(${ARCADIA_ROOT}/build/prebuilt/contrib/tools/protoc/plugins/grpc_java/ya.make.prebuilt) -ENDIF() - -IF (NOT PREBUILT) - INCLUDE(${ARCADIA_ROOT}/contrib/tools/protoc/plugins/grpc_java/bin/ya.make) -ENDIF() +INCLUDE(${ARCADIA_ROOT}/build/prebuilt/contrib/tools/protoc/plugins/grpc_java/ya.make.prebuilt) RECURSE( bin |